Merge branch 'pre'

* pre:
  提交修改
  提交代码
  提交代码
  分销代码
  修改区域公司
  1
  修改话费定时任务问题
  修改话费定时任务问题
  修改话费定时任务问题
  1
  修改话费定时任务问题
  修改话费定时任务问题
  修改话费定时任务问题

# Conflicts:
#	hai-service/src/main/resources/prod-9401/commonConfig.properties
#	hai-service/src/main/resources/prod/commonConfig.properties

hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@@ -210,8 +210,9 @@ public class HighOrderServiceImpl implements HighOrderService {
                 }
 
                 if (couponDetail.getCouponSource().equals(4)) {
+                    String code = String.valueOf(new Random().nextInt(899999) + 100000);
                     // 下单请求
-                    JSONObject jsonObject = HuiLianTongConfig.recharge(highOrder.getOrderNo(),
+                    JSONObject jsonObject = HuiLianTongConfig.recharge(highOrder.getOrderNo() + "_"+code,
                             childOrder.getSaleCount(),
                             couponDetail.getCouponKey(),
                             highOrder.getMemPhone());

hai-service/src/main/resources/prod-9401/commonConfig.properties

@@ -96,4 +96,5 @@ unionSecret=a0f380bb22cd4ce2a8d35f3bf437d6fa
 unionRsaKey=f2e6b6b95da445866194498c371a7c8af2e6b6b95da44586
 
 #url
-fileUrl=/home/project/hlt/filesystem/
+fileUrl=/home/project/hsg/filesystem/
+

hai-service/src/main/resources/prod/commonConfig.properties

@@ -94,4 +94,5 @@ unionSecret=a0f380bb22cd4ce2a8d35f3bf437d6fa
 unionRsaKey=f2e6b6b95da445866194498c371a7c8af2e6b6b95da44586
 
 #url
-fileUrl=/home/project/hlt/filesystem/
+fileUrl=/home/project/hsg/filesystem/
+