Merge branch 'dev_yy' into 2.0-dev

* 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

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) {

hai-cweb/src/main/java/com/cweb/controller/HighUserDiscountController.java

@@ -157,7 +157,7 @@ public class HighUserDiscountController {
 
             Map<String,Object> 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);

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<String, Object> 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);
         // 配置积分折扣比例

hai-user/src/main/java/com/web/controller/DiscountController.java

@@ -53,7 +53,9 @@ public class DiscountController {
 
             Map<String, Object> 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);