Merge branch 'fix/0420-mall' into master_saas

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

@@ -1,10 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
-import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
-import com.ym.mec.biz.dal.dao.StudentTeacherMapperDao;
-import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationActivityDto;
 import com.ym.mec.biz.dal.dto.DegreeRegistrationDto;
 import com.ym.mec.biz.dal.dto.PageInfoDegree;
@@ -61,6 +58,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
     private SubjectService subjectService;
 
     @Autowired
+    private SubjectDao subjectDao;
+
+    @Autowired
     private OrganizationService organizationService;
 
     @Override
@@ -280,7 +280,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             // 设置声部
             Set<Integer> subjectIdSet = dataList.stream().map(o -> o.getSubjectId()).filter(Objects::nonNull).collect(Collectors.toSet());
 
-            List<Subject> subjectList = subjectService.findBySubjectByIdList(new ArrayList<>(subjectIdSet));
+            List<Subject> subjectList = subjectDao.findBySubjectIds(new ArrayList<>(subjectIdSet));
 
             // id 分组
             Map<Integer, Subject> subjectMap = subjectList.stream().collect(Collectors.toMap(Subject::getId, Function.identity()));

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

@@ -1369,7 +1369,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                                 sellOrder.setTransNo(transNo);
                                 sellOrder.setOrderId(paymentOrderId);
                                 sellOrder.setOrderNo(orderNo);
-                                sellOrder.setExpectAmount(goodsVo.getRealAmount());
+                                sellOrder.setExpectAmount(totalAmount);
                                 if(goodsOrderItemVOS.size() - 1 == i){
                                     sellOrder.setBalanceAmount(subjectBalance);
                                 }else {

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PaymentController.java

@@ -11,8 +11,10 @@ import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.yonge.cooleshow.mall.common.enums.OrderCacheEnum;
+import com.yonge.cooleshow.mbg.model.UserOrderPayment;
 import com.yonge.cooleshow.portal.dto.OrderPayRes;
 import com.yonge.cooleshow.portal.service.OmsPortalOrderService;
+import com.yonge.cooleshow.portal.service.UserOrderPaymentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.redisson.api.RLock;
@@ -52,6 +54,8 @@ public class PaymentController extends BaseController {
     @Autowired
     private RedissonClient redissonClient;
 
+    @Autowired
+    private UserOrderPaymentService userOrderPaymentService;
 
 
     /***
@@ -78,7 +82,14 @@ public class PaymentController extends BaseController {
                 String transType = request.getParameter("type");
 
 
-                RLock lock = redissonClient.getLock(OrderCacheEnum.LOCK_ORDER_NO_MALL.getRedisKey(dataObj.getString("order_no")));
+                String paymentOrderNo = dataObj.getString("order_no");
+
+                UserOrderPayment userOrderPayment = userOrderPaymentService.getByAdapayNo(paymentOrderNo);
+                if (userOrderPayment == null) {
+                    throw new BizException("订单不存在");
+                }
+
+                RLock lock = redissonClient.getLock(OrderCacheEnum.LOCK_ORDER_NO_MALL.getRedisKey(userOrderPayment.getOrderNo()));
                 try {
                     boolean b = lock.tryLock(60, TimeUnit.SECONDS);
 
@@ -87,7 +98,7 @@ public class PaymentController extends BaseController {
                         switch (transType) {
                             case "payment.succeeded":// 支付成功
 
-                                orderService.paymentSucceededHandle(dataObj.getString("order_no"),
+                                orderService.paymentSucceededHandle(paymentOrderNo,
                                                    dataObj.getBigDecimal("pay_amt"),dataObj.getString("pay_channel"));
 
                                 break;
@@ -99,8 +110,8 @@ public class PaymentController extends BaseController {
                                 notifyMap.put("channelType", dataObj.getString("pay_channel"));
                                 notifyMap.put("tradeState", "0");
                                 notifyMap.put("totalMoney", dataObj.getString("pay_amt"));
-                                notifyMap.put("merOrderNo", dataObj.getString("order_no"));
-                                orderService.paymentFailedHandle(dataObj.getString("order_no"),notifyMap);
+                                notifyMap.put("merOrderNo", paymentOrderNo);
+                                orderService.paymentFailedHandle(paymentOrderNo,notifyMap);
 
                                 break;
                             case "payment_reverse.succeeded" :

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

@@ -889,7 +889,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             LOG.error("汇付支付回调，订单状态异常。 req is {}", detail.getOrderSn());
 
 
-            orderRefund(orderPayment,detail.getPayAmount().toString());
+//            orderRefund(orderPayment,detail.getPayAmount().toString());
         }
 
     }