开发支付订单的接口

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ProductOrderController.java

@@ -46,8 +46,8 @@ public class ProductOrderController extends BaseController {
     /**
      * 支付订单
      *
-     * @param request 订单创建请求
-     * @return R<String> 订单编号
+     * @param productOrderPayRequest 订单支付请求
+     * @return R 订单支付结果
      */
     @PostMapping("/pay")
     public R payProductOrder(@RequestBody ProductOrderPayRequest productOrderPayRequest) {

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TConsumptionLog.java

@@ -36,9 +36,9 @@ public class TConsumptionLog extends Model<TConsumptionLog> {
     private BigDecimal amount;
 
     /**
-     * 业务类型 1充值,2余额支付,3技师收益,4技师提现
+     * 业务类型 1充值,2余额支付,3技师收益,4技师提现 5:微信支付 6分销收益
      */
-    @ApiModelProperty("业务类型 1充值,2余额支付,3技师收益,4技师提现")
+    @ApiModelProperty("业务类型 1充值,2余额支付,3技师收益,4技师提现 5:微信支付 6分销收益")
     private Integer billType;
 
     /**

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ProductOrderInfoServiceImpl.java

@@ -200,7 +200,12 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         return orderItem;
     }
 
-
+    /**
+     * 支付订单
+     * @param productOrderPayRequest 订单支付请求
+     * @return R 订单支付结果
+     * @throws Exception
+     */
     @Override
     public R payOrder(ProductOrderPayRequest productOrderPayRequest) throws Exception {
         // 1、校验订单是否存在
@@ -251,6 +256,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
     public void orderPayManage(TWxUser user, ProductOrderInfo orderInfo) {
         // 更新用户金额 及下单此时
         TWxUser paramUser = new TWxUser();
+        paramUser.setId(user.getId());
         paramUser.setcOpenid(user.getcOpenid());
         // 余额支付
         if (orderInfo.getPayType().equals(MassageConstants.INTEGER_TWO)) {
@@ -258,8 +264,8 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         }
         paramUser.setdMoney(user.getdMoney().add(orderInfo.getTotalAmount()));
         paramUser.setnNum(user.getnNum() + MassageConstants.INTEGER_ONE);
-        paramUser.setId(user.getId());
         wxUserService.updateById(paramUser);
+
         //增加消费记录
         TConsumptionLog tConsumptionLog = new TConsumptionLog();
         tConsumptionLog.setAmount(orderInfo.getTotalAmount().negate());
@@ -272,13 +278,11 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
             tConsumptionLog.setBillType(BillTypeEnum.WX_PAY.getCode());
             tConsumptionLog.setNote("微信支付");
         }
-
         consumptionLogService.save(tConsumptionLog);
 
         ProductOrderInfo productOrderInfo = new ProductOrderInfo();
         productOrderInfo.setId(orderInfo.getId());
         productOrderInfo.setPayType(orderInfo.getPayType());
-        productOrderInfo.setOpenId(orderInfo.getOpenId());
         //更新订单状态为待发货
         productOrderInfo.setOrderStatus(ProductOrderStatusEnum.WAIT_DELIVERY.getCode());
         productOrderInfo.setPayTime(LocalDateTime.now());