退款

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.Kfc, kfcOrderId);
+                ResultContent<GoodsResultModel> kfcChannelGoods = orderService2.findChannelGoods(JobFlowMap.YPP, kfcOrderId);
                 GoodsResultModel kfcgoodsResultModel = kfcChannelGoods.getContent();
                 UpdateGoodsModel kfcupdateGoodsModel = new UpdateGoodsModel();
                 kfcupdateGoodsModel.setId(kfcgoodsResultModel.getId());
@@ -230,20 +230,27 @@ public class YppService {
                 kfcentries.put("sync", syncOrderRequest.getData());
                 kfcupdateGoodsModel.setExtend(kfcentries);
                 switch (kfcState) {
+
                     case "3":
                         kfcupdateGoodsModel.setGoodsState(OrderType.USED);
-                        break;
+                    break;
                     case "6":
                     case "8":
                         ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
                         applicantRefundParam2Model.setId(kfcgoodsResultModel.getId());
                         applicantRefundParam2Model.setRemark("点餐退款：" + kfcRefundAmount);
                         applicantRefundParam2Model.setUserId(kfcgoodsResultModel.getUserId());
-                        try {
+                        paymentService2.refund(applicantRefundParam2Model);
+                        RefundParam2Model refundParam2Model = new RefundParam2Model();
+                        refundParam2Model.setId(kfcgoodsResultModel.getId());
+                        refundParam2Model.setRefundAmount(BigDecimal.valueOf(Double.parseDouble(kfcRefundAmount)));
+                        refundParam2Model.setBuyShopAmount(BigDecimal.valueOf(Double.parseDouble(kfcRefundAmount)));
+                        refundParam2Model.setUseShopAmount(BigDecimal.ZERO);
+                        refundParam2Model.setPlatformAmount(BigDecimal.ZERO);
+                        refundParam2Model.setOrderType(OrderType.PASS_WITHDRAW);
+
 
-                            paymentService2.applicantRefund(applicantRefundParam2Model);
-                        } catch (Exception e) {
-                        }
+                        paymentService2.auditRefund(refundParam2Model);
                         break;
                 }
                 orderService2.updateGoods(kfcupdateGoodsModel);