gongfuzhu 7 bulan lalu
induk
melakukan
ec81c6a78d

+ 0 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/standard/StandarDeliveryJob.java

@@ -58,7 +58,6 @@ public class StandarDeliveryJob {
                         resultContent.set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail));
                         return RepeatStatus.FINISHED;
                     }
-                    orderService2.delivery(goodsResultModel.getId());
                     resultContent.set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Success));
                     return RepeatStatus.FINISHED;
 

+ 8 - 4
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/YppService.java

@@ -67,7 +67,7 @@ public class YppService {
         String orderNo = snowflake.nextIdStr();
         AccountDetailVo accountDetailVo = shopSetting.getContent();
         List<ShopInfoSimpleVo> shops = accountDetailVo.getShops();
-        if (shops.isEmpty()){
+        if (shops.isEmpty()) {
             return ResultContent.build(ResultState.Fail, "有票票店铺未创建");
         }
         // 分账信息
@@ -222,7 +222,7 @@ public class YppService {
                 String kfcState = String.valueOf(kfcData.get("orderState"));
                 String kfcRefundAmount = String.valueOf(kfcData.get("refundAmount"));
                 String kfcOrderId = String.valueOf(kfcData.get("id"));
-                ResultContent<GoodsResultModel> kfcChannelGoods = orderService2.findChannelGoods(JobFlowMap.YPP, kfcOrderId);
+                ResultContent<GoodsResultModel> kfcChannelGoods = orderService2.findChannelGoods(JobFlowMap.Kfc, kfcOrderId);
                 GoodsResultModel kfcgoodsResultModel = kfcChannelGoods.getContent();
                 UpdateGoodsModel kfcupdateGoodsModel = new UpdateGoodsModel();
                 kfcupdateGoodsModel.setId(kfcgoodsResultModel.getId());
@@ -233,7 +233,7 @@ public class YppService {
 
                     case "3":
                         kfcupdateGoodsModel.setGoodsState(OrderType.USED);
-                    break;
+                        break;
                     case "6":
                     case "8":
                         ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
@@ -249,8 +249,12 @@ public class YppService {
                         refundParam2Model.setPlatformAmount(BigDecimal.ZERO);
                         refundParam2Model.setOrderType(OrderType.PASS_WITHDRAW);
 
+                        try {
+                            paymentService2.auditRefund(refundParam2Model);
+
+                        } catch (Exception e) {
+                        }
 
-                        paymentService2.auditRefund(refundParam2Model);
                         break;
                 }
                 orderService2.updateGoods(kfcupdateGoodsModel);