现金支付金额

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -1120,12 +1120,12 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         } else {
             studentPaymentOrder.setPaymentChannel("ADAPAY");
         }
-        studentPaymentOrder.setVersion(1);
+        studentPaymentOrder.setVersion(0);
         studentPaymentOrder.setOrganId(student.getOrganId());
         studentPaymentOrder.setRoutingOrganId(student.getOrganId());
         studentPaymentOrder.setTenantId(student.getTenantId());
         studentPaymentOrderService.insert(studentPaymentOrder);
-        studentPaymentOrder.setVersion(0);
+        studentPaymentOrder.setVersion(studentPaymentOrder.getVersion() +1);
 
         // 余额支付
         BigDecimal amount = studentPaymentOrder.getActualAmount();

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -416,6 +416,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         BigDecimal balanceAmount1 = MapUtil.get(data, "balanceAmount", BigDecimal.class);
         if (BigDecimal.ZERO.compareTo(balanceAmount1) !=0 ) {
             order.setIntegrationAmount(balanceAmount1);
+            order.setPayAmount(orderParam.getOrderAmount().subtract(balanceAmount1));
             orderMapper.updateByPrimaryKey(order);
         }
         result.put("pay",data);