order pay

src/main/java/com/gogirl/application/market/impl/MarketServiceImpl.java

@@ -525,13 +525,15 @@ public class MarketServiceImpl implements MarketService {
                                 } else {
                                     couponOrderRelevance.setAchievement(couponOrderRelevance.getDiscountAmount());
                                 }
-
-                                //保存卡券在订单服务上的使用请款
+                                //保存卡券在订单服务上的使用情况
                                 couponOrderRelevanceService.save(couponOrderRelevance);
+                                //免单券Id
                                 List<Integer> discountConfigListCouponId = discountConfigMapper.selectList(new QueryWrapper<>()).stream().map(DiscountConfig::getCouponId).filter(Objects::nonNull).collect(Collectors.toList());
+                                //如果不是免单券 业绩就要扣除实际折扣金额
                                 if (!discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId())) {
                                     orderServe.setAchievement(orderServe.getAchievement().subtract(actualDiscountAmount));
                                 }
+
                                 orderServe.addDiscountPrice(actualDiscountAmount);
                                 orderManage.addDiscountPrice(actualDiscountAmount);
 

src/main/java/com/gogirl/application/order/serve/OrderManageService.java

@@ -47,7 +47,7 @@ public interface OrderManageService extends IService<OrderManage> {
      *
      * @param orderId
      */
-    void checkOrder(String orderId);
+    void checkOrder(Integer orderId);
 
     /**
      * 美甲师录入款式/色号和款式描述

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -424,7 +424,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
     }
 
     @Override
-    public void checkOrder(String orderId) {
+    public void checkOrder(Integer orderId) {
         OrderManage orderManage = orderManageMapper.selectById(orderId);
         if (orderManage.getStatus() != 11) {
             throw new RRException("订单状态异常");
@@ -440,13 +440,15 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         }
         Customer customer = customerService.selectByCustomerId(orderManage.getOrderUser());
 
-        subscribeService.sendOrderPayNotifyMsg(customer.getOpenid1(),
+        subscribeService.sendOrderPayNotifyMsg(orderId,
+                customer.getOpenid1(),
                 name,
                 orderManage.getOrderNo(),
                 orderManage.getTotalPaymentAmount(),
                 customer.getRealName());
     }
 
+
     @Override
     public void recordOrderServeData(OrderServe param) {
         if (param == null || param.getId() == null) {
@@ -825,7 +827,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         orderManage.setPayTime(new Date());
         //发送订阅消息
-        subscribeService.sendPaySuccessMsg(customer.getOpenid1(), payTypeStr, new Date(), orderManage.getTotalPaymentAmount(), new BigDecimal(customerBalance.getBalance() / 100));
+        subscribeService.sendPaySuccessMsg(orderId, customer.getOpenid1(), payTypeStr, new Date(), orderManage.getTotalPaymentAmount(), new BigDecimal(customerBalance.getBalance() / 100));
         this.updateById(orderManage);
 
     }

src/main/java/com/gogirl/infrastructure/subscribe/SubscribeService.java

@@ -5,7 +5,11 @@ import java.util.Date;
 
 public interface SubscribeService {
 
-    void sendScheduleMsg(String openId, String scheduleName, Date arriveTime, String departmentName, String address);
+    void sendScheduleMsg(String openId,
+                         String scheduleName,
+                         Date arriveTime,
+                         String departmentName,
+                         String address);
 
     /**
      * 预约过期订阅消息发送
@@ -16,7 +20,11 @@ public interface SubscribeService {
      * @param departmentName 店铺名称
      * @param address        店铺地址
      */
-    void sendOverScheduleMsg(String openId, String scheduleName, Date arriveTime, String departmentName, String address);
+    void sendOverScheduleMsg(String openId,
+                             String scheduleName,
+                             Date arriveTime,
+                             String departmentName,
+                             String address);
 
     /**
      * 支付成功通知
@@ -27,7 +35,12 @@ public interface SubscribeService {
      * @param paymentAmount 支付金额
      * @param balance       余额
      */
-    void sendPaySuccessMsg(String openId, String payType, Date paymentTime, BigDecimal paymentAmount, BigDecimal balance);
+    void sendPaySuccessMsg(Integer orderId,
+                           String openId,
+                           String payType,
+                           Date paymentTime,
+                           BigDecimal paymentAmount,
+                           BigDecimal balance);
 
     /**
      * 订单待支付提醒
@@ -38,7 +51,19 @@ public interface SubscribeService {
      * @param paymentAmount 支付金额
      * @param customerName  用户名字
      */
-    void sendOrderPayNotifyMsg(String openId, String serveName, String orderNo, BigDecimal paymentAmount, String customerName);
+    void sendOrderPayNotifyMsg(Integer orderId,
+                               String openId,
+                               String serveName,
+                               String orderNo,
+                               BigDecimal paymentAmount,
+                               String customerName);
 
-    void testPaper(String openid1, Integer id);
+    /**
+     * 问卷调查
+     *
+     * @param openid1
+     * @param id
+     */
+    void testPaper(String openid1,
+                   Integer id);
 }

src/main/java/com/gogirl/infrastructure/subscribe/impl/SubscribeServiceImpl.java

@@ -57,7 +57,11 @@ public class SubscribeServiceImpl implements SubscribeService {
 
     @Async
     @Override
-    public void sendOverScheduleMsg(String openId, String scheduleName, Date arriveTime, String departmentName, String address) {
+    public void sendOverScheduleMsg(String openId,
+                                    String scheduleName,
+                                    Date arriveTime,
+                                    String departmentName,
+                                    String address) {
 
         String tips = "您已超时15分钟，预约已取消，请重新预约";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -86,7 +90,12 @@ public class SubscribeServiceImpl implements SubscribeService {
 
     @Async
     @Override
-    public void sendPaySuccessMsg(String openId, String payType, Date paymentTime, BigDecimal paymentAmount, BigDecimal balance) {
+    public void sendPaySuccessMsg(Integer orderId,
+                                  String openId,
+                                  String payType,
+                                  Date paymentTime,
+                                  BigDecimal paymentAmount,
+                                  BigDecimal balance) {
 
         String tips = "点击即可查看详情，如有疑问请联系客服";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -114,13 +123,18 @@ public class SubscribeServiceImpl implements SubscribeService {
 
     @Async
     @Override
-    public void sendOrderPayNotifyMsg(String openId, String serveName, String orderNo, BigDecimal paymentAmount, String customerName) {
+    public void sendOrderPayNotifyMsg(Integer orderId,
+                                      String openId,
+                                      String serveName,
+                                      String orderNo,
+                                      BigDecimal paymentAmount,
+                                      String customerName) {
 
         String tips = "亲，支付完成后请给店员确认哦，谢谢！";
         wxSubscribeControllerFeign.send(WxSubscribeMessageRequest.builder()
                 .toUser(openId)
                 .accessToken(accessTokenService.getAccessToken().getAccessToken())
-                .page("pages/mine/serve-details")
+                .page("pages/mine/serve-details?orderId=" + orderId)
                 //模板id
                 .templateId(wxProperties.getOrderPayNotifyTpl())
                 .data(OrderNotifySubscribeMsgData.builder()
@@ -139,7 +153,8 @@ public class SubscribeServiceImpl implements SubscribeService {
 
 
     @Override
-    public void testPaper(String openId, Integer orderId) {
+    public void testPaper(String openId,
+                          Integer orderId) {
         wxSubscribeControllerFeign.send(WxSubscribeMessageRequest
                 .builder()
                 .toUser(openId)

src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java

@@ -217,7 +217,7 @@ public class OrderManageController {
     @ApiOperation("核算订单")
     @GetMapping("/technician/ordermanage/checkOrder")
     public JsonResult<Void> checkOrder(@RequestHeader String token,
-                                       @RequestParam String orderId) {
+                                       @RequestParam Integer orderId) {
         orderManageService.checkOrder(orderId);
         return JsonResult.success();
     }