From de67f3c40c20694a2bd25f13c4ef9cf472351e81 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 10 Jan 2023 16:37:29 +0800 Subject: [PATCH] Merge branch 'dev_yy' into 2.0-dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * dev_yy: (25 commits) 提交代理商 1 1 提交实物 提交代码 提交代码 提交代码 提交抽奖代码 1 提交代码 提交代码 提交代码 提交代码 提交代码 提交 1 1 修改首页没有积分专区 提交代码 修改小程序注册用券 ... # Conflicts: # hai-cweb/src/main/java/com/cweb/controller/HighTestController.java # hai-service/src/main/java/com/hai/common/utils/DateUtil.java # hai-service/src/main/java/com/hai/common/utils/RequestUtils.java # hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java # hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java # hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java # hai-service/src/main/java/com/hai/entity/HighChildOrder.java # hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java # hai-service/src/main/java/com/hai/entity/HighOrder.java # hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java # hai-service/src/main/java/com/hai/service/HighUserService.java # hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java # hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java # hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java # hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java --- .../OutRechargePriceController.java | 2 +- .../HighUserDiscountController.java | 2 +- .../impl/OutRechargePriceServiceImpl.java | 6 +++--- .../web/controller/DiscountController.java | 4 +++- .../web/controller/DiscountController.class | Bin 3737 -> 3777 bytes 5 files changed, 8 insertions(+), 6 deletions(-) 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 71fc34f283aa9535511508a6d67d4186c2cd3218..9eb7b7ca6d9bc3afcae437009770d4d98632d70f 100644 GIT binary patch delta 799 zcmZ9ISx=K;5QU$vZ~OHvA{Zh;FeV0&MIs;w2vQVxM6G~=h!v`WY}$e=Runf}KtDxs z!+rO{G%@OhiMRX*e}NbN0isSJ!Nf0L-Z^t-&dJP-r+!b3O#c4*4JhP;fuhMx8oL$E z27736vzLIIeY7gtTm%jFb3k#>z@W)RyMc`kgF|$B=%U-8hh7(lT@)J}A*2Y$?D{

waA^tRx7<)!BXmFNuA4evw-e$#+5Q_8C9BsArTazwmE^qoL^IAk3-N93q1K+h?r>cw z=x^=m4Jz(y9`Mktb!H|$(oFDJlgSgsQ_VA;o5Rj}&kM~vOqiSVg*i4F1SVw9 zz+9;&+vPE%x*#$r2S~@=2tCbYb!+#>WaaP{Iz%XrY`=DnwPukW@yg zB1cr)afvQ0>UKRrO-C+ECB{&(cv_%YV2MEMG+8RhHjT;z*;y%A zOWTZHx!6?*lYwoDbj7MEaut<-#MPnjDXM0FEQ-~vF+Y3LBGqEPwh2p!b*z^dlwCHm zNsKm&_1X|MY>~ugm#kKLw}xc6ZH=Tp z;ygVW5)*we@s&4!f&LJq?pur`CO2oVweMc*tbM+wPNv3YetrG|@7e8r&Q*aL{ScMYop-hus9-6d3f-YtY9L#Zk*H>ZP9n zgM|zl9OJlR$Z8L}IpM`O!l>0fsfZbzV(i1jjNNDwrZ_E=)9sEyd;S^CSYVLAR zF{!!F0~>zRFc$eMdfIz6=`2?~)I8#`CW9x6Da})!nNzMh?{m!yUTR+P+O(-m*Bi}S z-c5&8nLQ~n9%Z1vGZLr@_f3y^zS}+BxFimerBjE}Qe4Tt>`%;dP%m(P)-25VNOFo( z4)dGNiw!YM3Qn>_m5Y{h6-j~?kSEdB5TJk%YuQGSdWvXeohXVKp@eZt$reQoZqY57uy)RLemRfPV1*c4@KFn=WaW94GIu@PI8O>CCh#uh5rDi)Pux-lvXRS5|> zg>9GF>Zrup(ZJ3*9{i6NTD)fNf6**=OOh4R&5Xyh_5zPNnzSTimmoX4StfO{ELSJB PTqb98)w9RKQTF};y;Ov<