Merge branch 'dev_bug_20221101' into saas

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

@@ -393,7 +393,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         userOrderPayment.setCreateTime(new Date());
 
         if (order.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
-            paySuccess(order.getId(),order.getPayType());
+            paySuccess(order.getId(),3);
             order.setStatus(1);
             result.put("orderType","success");
             userOrderPayment.setStatus(TradeStatusEnum.succeeded.getCode());
@@ -407,7 +407,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                                        orderParam.getTeacherId()==null?null:orderParam.getTeacherId().intValue(),
                                        currentMember.getId().intValue(), amount,JSON.toJSONString(detail),orderParam.isUseBalance());
         if ("1".equals(MapUtil.getStr(data, "tradeState"))) {
-            paySuccess(order.getId(),order.getPayType());
+            paySuccess(order.getId(),3);
             order.setStatus(1);
             result.put("orderType","success");
             userOrderPayment.setStatus(TradeStatusEnum.succeeded.getCode());