gongfuzhu 8 månader sedan
förälder
incheckning
99b9732497

+ 1 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/SycController.java

@@ -94,7 +94,7 @@ public class SycController {
         apiLog.setSystem("video2");
         apiLog.setRequest(JSONUtil.toJsonStr(notifyOrderReq));
         apiLog.setService("syncOrderState");
-        apiLog.setResponse("ok");
+        apiLog.setResponse("success");
         apiLogDao.save(apiLog);
         video2ServiceImpl.notifyOrder(notifyOrderReq);
 

+ 9 - 6
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/Video2ServiceImpl.java

@@ -146,12 +146,15 @@ public class Video2ServiceImpl implements Video2Service {
         if (notifyOrderReq.getStatus().equals("01")) {
             updateGoodsModel.setGoodsState(OrderType.USED);
         } else if (notifyOrderReq.getStatus().equals("03")) {
-            ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
-            applicantRefundParam2Model.setId(goodsResultModel.getId());
-            applicantRefundParam2Model.setRemark("充值失败退款");
-            applicantRefundParam2Model.setUserId(goodsResultModel.getUserId());
-            paymentService2.refund(applicantRefundParam2Model);
-
+            if (goodsResultModel.getPayAmount().equals(BigDecimal.ZERO)) {
+                updateGoodsModel.setGoodsState(OrderType.CLOSE);
+            } else {
+                ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
+                applicantRefundParam2Model.setId(goodsResultModel.getId());
+                applicantRefundParam2Model.setRemark("充值失败退款");
+                applicantRefundParam2Model.setUserId(goodsResultModel.getUserId());
+                paymentService2.refund(applicantRefundParam2Model);
+            }
         }
         updateGoodsModel.setExtend(JSONUtil.parseObj(notifyOrderReq));
         orderService2.updateGoods(updateGoodsModel);