退款不分退款

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, "有票票店铺未创建");
         }
         // 分账信息
@@ -229,14 +229,18 @@ public class YppService {
                 JSONObject kfcentries = JSONUtil.parseObj(kfcgoodsResultModel.getExtend());
                 kfcentries.put("sync", syncOrderRequest.getData());
                 kfcupdateGoodsModel.setExtend(kfcentries);
-                if (kfcState.equals("3")) {
-                    kfcupdateGoodsModel.setGoodsState(OrderType.USED);
-                } else {
-                    ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
-                    applicantRefundParam2Model.setId(kfcgoodsResultModel.getId());
-                    applicantRefundParam2Model.setRemark("点餐退款：" + kfcRefundAmount);
-                    applicantRefundParam2Model.setUserId(kfcgoodsResultModel.getUserId());
-                    paymentService2.refund(applicantRefundParam2Model);
+                switch (kfcState) {
+                    case "3":
+                        kfcupdateGoodsModel.setGoodsState(OrderType.USED);
+                        break;
+                    case "6":
+                    case "8":
+                        ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
+                        applicantRefundParam2Model.setId(kfcgoodsResultModel.getId());
+                        applicantRefundParam2Model.setRemark("点餐退款：" + kfcRefundAmount);
+                        applicantRefundParam2Model.setUserId(kfcgoodsResultModel.getUserId());
+                        paymentService2.refund(applicantRefundParam2Model);
+                        break;
                 }
                 orderService2.updateGoods(kfcupdateGoodsModel);