Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -1335,6 +1335,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         }
         // MANUAL_RECEIVE 手动确认,AUTO_RECEIVE 自动确认
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
+        studentPaymentOrder.setVersion(orderByOrderNo.getVersion());
         studentPaymentOrder.setId(orderByOrderNo.getId());
         if (autoReceive) {
             studentPaymentOrder.setReceiveStatus("AUTO_RECEIVE");

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

@@ -131,6 +131,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
     @Override
     public Map<String, Object> generateOrder(OrderParam orderParam) {
+
+        LOG.info("订单生成请求参数：{}",orderParam);
         OmsOrder order = new OmsOrder();
         String orderSn = generateOrderSn();
         if (!StringUtil.isEmpty(orderParam.getOrderNo())) {
@@ -152,7 +154,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                 userOrderPayment.setCreateTime(new Date());
                 userOrderPaymentService.saveOrUpdate(userOrderPayment);
 
-                return feignMecCreateOrder(detail.getCouponId(), oldOrderNo, orderSn, null, detail.getMemberId().intValue(), detail.getTotalAmount(),
+                return feignMecCreateOrder(detail.getCouponId(), oldOrderNo, orderSn, orderParam.getTeacherId().intValue()
+                        , detail.getMemberId().intValue(), detail.getTotalAmount(),
                        JSON.toJSONString(detail),detail.getPayType()!= null && detail.getPayType() == 3);
             } else {
                 throw new BizException("订单信息获取失败");
@@ -377,7 +380,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             result.put("orderType","success");
             userOrderPayment.setStatus(TradeStatusEnum.succeeded.getCode());
         }
-        userOrderPaymentService.save(userOrderPayment);
+        userOrderPaymentService.saveOrUpdate(userOrderPayment);
 
         // 生成订单
         // 保存商品信息到管乐迷
@@ -390,7 +393,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             order.setStatus(1);
             result.put("orderType","success");
             userOrderPayment.setStatus(TradeStatusEnum.succeeded.getCode());
-            userOrderPaymentService.save(userOrderPayment);
+            userOrderPaymentService.saveOrUpdate(userOrderPayment);
         }
         result.put("pay",data);
 
@@ -413,6 +416,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                                     BigDecimal amount, String orderDetail,boolean useBalance) {
         // 远程调用管乐迷订单记录
         MallCreateOrderModel model = new MallCreateOrderModel();
+        model.setTeacherId(teacherId);
         model.setAmount(amount);
         model.setOrderNo(orderSn);
         model.setUseBalance(useBalance);