Merge branch 'dev_kuaidi_20221026'

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/open/OpenShareController.java

@@ -81,7 +81,7 @@ public class OpenShareController extends BaseController {
         orderCourierService.updateCourierInfo(courierInfos);
         Map<String,Object> result = new HashMap<>();
         result.put("result",true);
-        result.put("returnCode",200);
+        result.put("returnCode","200");
         result.put("message","成功");
 
         return result;

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

@@ -1059,16 +1059,18 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         }
 
         // 判断支付金额 是否正确
-        BigDecimal pay_amt;
+        BigDecimal pay_amt = null;
         if (data != null) {
             pay_amt = new BigDecimal(data.getExecutePaymentCallBack().getPayAmt());
 
             orderPayment.setTransNo(data.getId());
         } else {
-            pay_amt = new BigDecimal(payment.getPayAmt());
+            if (payment.getPayAmt() != null) {
+                pay_amt = new BigDecimal(payment.getPayAmt());
+            }
             orderPayment.setTransNo(payment.getId());
         }
-        if (pay_amt.compareTo(detail.getPayAmount()) != 0) {
+        if (pay_amt != null && pay_amt.compareTo(detail.getPayAmount()) != 0) {
             orderPayment.setPayFailMsg("订单金额和实际支付金额不符");
             orderRefund(orderPayment,pay_amt.setScale(2, RoundingMode.HALF_UP).toString(),orderPayment.getTransNo(),detail);
         } else {