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

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

@@ -15,6 +15,7 @@ import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
 import com.ym.mec.util.json.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
@@ -80,12 +81,15 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         checkSing(payParam);
 
         Map<String, Object> payment = new HashMap<>();
-        if (platform != null) {
+        if (StringUtils.isBlank(platform)) {
             //根据传入platform 来判断执行哪个操作
             Function<PaymentParam, Map<String, Object>> function = checkOrderType.get(platform);
             //如果以上操作都没有 则应该是这一个，因为老代码就是这样写的。
             if (Objects.isNull(function)) {
                 StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findOrderByOrderNo(payParam.getOrderNo());
+                if (Objects.isNull(studentPaymentOrder)) {
+                    throw new BizException("订单不存在");
+                }
                 payParam.setTenantId(studentPaymentOrder.getTenantId());
                 payment = checkOrderAndGetParam(payParam,
                         studentPaymentOrder,
@@ -105,6 +109,9 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     private Map<String, Object> teacher(PaymentParam payParam) {
         Map<String, Object> payment;
         TenantPaymentOrder tenantPaymentOrder = tenantPaymentOrderService.queryByOrderNo(payParam.getOrderNo());
+        if (Objects.isNull(tenantPaymentOrder)) {
+            throw new BizException("订单不存在");
+        }
         payParam.setTenantId(1);
         try {
             payment = checkOrderAndGetParam(payParam,
@@ -151,8 +158,12 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 
     //查询订单
     private TenantOrderRecord getTenantOrderRecord(String orderNo) {
-        return tenantOrderRecordService.getOne(new WrapperUtil<TenantOrderRecord>()
+        TenantOrderRecord orderRecord = tenantOrderRecordService.getOne(new WrapperUtil<TenantOrderRecord>()
                 .hasEq("order_no_", orderNo).queryWrapper());
+        if (Objects.isNull(orderRecord)) {
+            throw new BizException("订单不存在");
+        }
+        return orderRecord;
     }
 
     //获取支付数据
@@ -308,15 +319,15 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
             }
 
             // 实时分账
-			if (amount.doubleValue() > 0) {
-				List<Map<String, Object>> divMemberList = new ArrayList<>();
-				Map<String, Object> divMember = new HashMap<>();
-				divMember.put("member_id", merNos);
-				divMember.put("amount", amount);
-				divMember.put("fee_flag", "Y");
-				divMemberList.add(divMember);
-				paymentParams.put("div_members", JsonUtil.toJSONString(divMemberList));
-			}
+            if (amount.doubleValue() > 0) {
+                List<Map<String, Object>> divMemberList = new ArrayList<>();
+                Map<String, Object> divMember = new HashMap<>();
+                divMember.put("member_id", merNos);
+                divMember.put("amount", amount);
+                divMember.put("fee_flag", "Y");
+                divMemberList.add(divMember);
+                paymentParams.put("div_members", JsonUtil.toJSONString(divMemberList));
+            }
         }
 
         //手续费收取模式：O-商户手续费账户扣取手续费，I-交易金额中扣取手续费；值为空时，默认值为I；若为O时，分账对象列表中不支持传入手续费承担方

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

@@ -234,6 +234,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         if (couponIdList != null && couponIdList.size() > 0) {
             studentGoodsSell.setCouponIds(StringUtils.join(couponIdList, ","));
         }
+        studentGoodsSell.setTenantId(student.getTenantId());
         studentGoodsSellDao.insert(studentGoodsSell);
 
         if (studentGoodsSell.getType() == 1) {
@@ -249,6 +250,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setOrganId(student.getOrganId());
         studentPaymentOrder.setRoutingOrganId(student.getOrganId());
+        studentPaymentOrder.setTenantId(student.getTenantId());
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         studentPaymentOrder.setVersion(0);