Merge branch 'master' into 2.0-dev

* master:
  修改配置星巴克 肯德基 会员充值 话费 微信商户号
  修改配置星巴克 肯德基 会员充值 话费 微信商户号

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
#	hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java

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

@@ -117,7 +117,6 @@ public class CmsContentController {
                             Map<String, Object> mapUser = new HashMap<>();
 
                             mapUser.put("whereCheck" , false);
-                            mapUser.put("companyId" , companyId);
                             mapUser.put("msgType" , 1);
                             mapUser.put("userId" , userInfoModel.getHighUser().getId());
                             listUser = bsMsgService.queryMsgByList(mapUser);

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

@@ -372,6 +372,8 @@ public class CommonController {
     public ResponseData getRebateIntegral(@RequestBody JSONObject object) {
         try {
 
+            System.out.println(object);
+
             if (object.getInteger("type") == null ||
                     object.getLong("companyId") == null ||
                     object.getBigDecimal("price") == null

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

@@ -60,7 +60,7 @@ public class OutRechargePriceController {
     @ApiOperation(value = "查询充值金额列表")
     public ResponseData getRechargePriceByList(
             @RequestParam(name = "platformId", required = true) Integer platformId,
-            @RequestParam(name = "companyId", required = true) String companyId,
+            @RequestParam(name = "companyId", required = true) Long companyId,
             @RequestParam(name = "operatorType", required = true) Integer operatorType
     ) {
         try {

hai-schedule/src/main/java/com/hai/schedule/HighOrderSchedule.java

@@ -253,7 +253,7 @@ public class HighOrderSchedule {
     * @Param []
     * @return void
     */
-    @Scheduled(cron="0 0/1 * * * ?")   //每 1分钟执行一次
+    @Scheduled(cron="0 0/1 * * * ?")   //每 5分钟执行一次
     public void integralRebateOrder() {
 
         // 查询满足初步返利条件订单