fix:支付金额为0

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -97,7 +97,9 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
             returnApply.setReceiveTime(new Date());
             returnApply.setReceiveMan(statusParam.getReceiveMan());
             returnApply.setReceiveNote(statusParam.getReceiveNote());
-            refundAmount(omsOrderReturnApply);
+            if (returnApply.getReturnAmount().compareTo(BigDecimal.ZERO) >0) {
+                refundAmount(omsOrderReturnApply);
+            }
         } else if (status.equals(3)) {
             //拒绝退货
             returnApply.setId(id);

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

@@ -520,6 +520,14 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             orderPayRes.setMessage("订单已付款或已关闭");
             return orderPayRes;
         }
+        if (detail.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
+            orderPayRes.setPay_amt(detail.getPayAmount().setScale(2, RoundingMode.HALF_UP).toString());
+            orderPayRes.setPay_info("");
+            orderPayRes.setPayChannel(payReq.getPayChannel().getCode());
+            orderPayRes.setPaymentNo("");
+            orderPayRes.setStatus(true);
+            return orderPayRes;
+        }
         // UserOrderPayment userOrderPayment = userOrderPaymentService.getByOrderNo(detail.getOrderSn(),
         //                                              payReq.getPayChannel(),TradeStatusEnum.pending);
         //