update

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

@@ -961,21 +961,22 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         CustomerBalance customerBalance = customerBalanceMapper.selectOne(new LambdaQueryWrapper<CustomerBalance>()
                 .eq(CustomerBalance::getCustomerId, orderManage.getPayUser()));
 
-        BigDecimal balanceAmount = new BigDecimal(customerBalance.getBalance()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
-        BigDecimal wxAmount = orderManage.getTotalPaymentAmount().subtract(balanceAmount);
-
+//        BigDecimal balanceAmount = new BigDecimal(customerBalance.getBalance()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
+        BigDecimal wxAmount = new BigDecimal(result.getCashFee()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP);
+        BigDecimal balanceAmount =orderManage.getTotalPaymentAmount().subtract(wxAmount);
         MultiPaymentType wxMultiPaymentType = MultiPaymentType.builder()
                 .price(wxAmount)
                 .type(1).build();
         MultiPaymentType balanceMultiPaymentType = MultiPaymentType.builder()
                 .price(balanceAmount)
                 .type(2).build();
+
         orderManage.setMultiplePaymentType(JsonUtilByFsJson.beanToJson(Lists.newArrayList(wxMultiPaymentType, balanceMultiPaymentType)));
 
 
         ConsumerCommand consumerCmd = ConsumerCommand.builder()
                 .amount(customerBalance.getBalance())
-                .customerId(orderManage.getOrderUser())
+                .customerId(orderManage.getPayUser())
                 .departmentId(orderManage.getDepartmentId())
                 .orderId(orderManage.getId())
                 .orderStatus(orderManage.getStatus())

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

@@ -14,6 +14,7 @@ import com.gogirl.domain.user.customer.CustomerBalance;
 import com.gogirl.infrastructure.common.config.property.GogirlProperties;
 import com.gogirl.infrastructure.common.exception.RRException;
 import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
+import com.gogirl.infrastructure.common.util.SessionUtils;
 import com.gogirl.infrastructure.mapper.market.discount.DiscountConfigMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceMapper;
@@ -192,6 +193,8 @@ public class PayServiceImpl implements PayService {
                         .build();
 
         log.info("**微信下单参数构造**,{}", wxPayUnifiedOrderRequest.toString());
+        orderManage.setPayUser(SessionUtils.getCustomerId());
+        orderManageMapper.updateById(orderManage);
         //微信统一下单
         return wxPayService.createJsapiOrder(wxPayUnifiedOrderRequest);
     }