diff --git a/hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java b/hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java index b72a64be..ec80876b 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargePriceController.java @@ -95,7 +95,7 @@ public class OutRechargePriceController { OutRechargePriceModel outRechargePriceModel = new OutRechargePriceModel(); listMap = new HashMap<>(); listMap.put("returnType", 2); - listMap.put("productType", "3"); + listMap.put("productType", "9"); listMap.put("sourceId", list.getId()); BeanUtils.copyProperties(list, outRechargePriceModel); if (bsConfigService.getProductDiscountByMap(listMap) != null) { diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighUserDiscountController.java b/hai-cweb/src/main/java/com/cweb/controller/HighUserDiscountController.java index 64faa497..55c9238f 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighUserDiscountController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighUserDiscountController.java @@ -157,7 +157,7 @@ public class HighUserDiscountController { Map map = new HashMap<>(); map.put("userId", userInfoModel.getHighUser().getId()); - map.put("useScope", useScope); + map.put("discountUseScope", useScope); map.put("status", status); PageHelper.startPage(pageNum,pageSize); diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargePriceServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargePriceServiceImpl.java index a2c1c4b8..a8a76663 100644 --- a/hai-service/src/main/java/com/hai/service/impl/OutRechargePriceServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargePriceServiceImpl.java @@ -81,7 +81,7 @@ public class OutRechargePriceServiceImpl implements OutRechargePriceService { BeanUtils.copyProperties(outRechargePrice, outRechargePriceModel); Map listMap = new HashMap<>(); - listMap.put("productType", "3"); + listMap.put("productType", "9"); listMap.put("returnType", 1); listMap.put("sourceId", outRechargePrice.getId()); listMap.put("platformId", platformId); @@ -145,7 +145,7 @@ public class OutRechargePriceServiceImpl implements OutRechargePriceService { postObject.put("operatorId", object.getLong("operatorId")); postObject.put("operatorName", object.getString("operatorName")); postObject.put("sourceId", outRechargePrice.getId()); - postObject.put("productType", 3); + postObject.put("productType", 9); // 配置支付方式 commonService.configPayType(postObject); @@ -180,7 +180,7 @@ public class OutRechargePriceServiceImpl implements OutRechargePriceService { postObject.put("operatorId", object.getLong("operatorId")); postObject.put("operatorName", object.getString("operatorName")); postObject.put("sourceId", outRechargePrice.getId()); - postObject.put("productType", 3); + postObject.put("productType", 9); // 配置支付方式 commonService.configPayType(postObject); // 配置积分折扣比例 diff --git a/hai-user/src/main/java/com/web/controller/DiscountController.java b/hai-user/src/main/java/com/web/controller/DiscountController.java index ed3f754a..b09bbf72 100644 --- a/hai-user/src/main/java/com/web/controller/DiscountController.java +++ b/hai-user/src/main/java/com/web/controller/DiscountController.java @@ -53,7 +53,9 @@ public class DiscountController { Map param = new HashMap<>(); param.put("userId", userInfoModel.getHighUser().getId()); - param.put("useScope", useScope); + if (useScope != 1) { + param.put("discountUseScope", useScope); + } param.put("status", status); PageHelper.startPage(pageNum,pageSize); diff --git a/hai-user/target/classes/com/web/controller/DiscountController.class b/hai-user/target/classes/com/web/controller/DiscountController.class index 71fc34f2..9eb7b7ca 100644 Binary files a/hai-user/target/classes/com/web/controller/DiscountController.class and b/hai-user/target/classes/com/web/controller/DiscountController.class differ