合并0120分支

suishenbang-order/pom.xml

@@ -20,6 +20,11 @@
             <groupId>com.dgtly</groupId>
             <artifactId>suishenbang-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.dgtly</groupId>
+            <artifactId>suishenbang-sync-common</artifactId>
+            <version>4.0.0</version>
+        </dependency>
     </dependencies>
 
 </project>

suishenbang-order/src/main/java/com/dgtly/order/controller/CustomersStartController.java

@@ -1,6 +1,8 @@
 package com.dgtly.order.controller;
 
 import java.util.List;
+
+import com.dgtly.sync.service.HanaOrderComponent;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -34,6 +36,9 @@ public class CustomersStartController extends BaseController
     @Autowired
     private ICustomersStartService customersStartService;
 
+    @Autowired
+    private HanaOrderComponent hanaOrderComponent;
+
     @RequiresPermissions("order:customersStart:view")
     @GetMapping()
     public String customersStart()
@@ -90,6 +95,20 @@ public class CustomersStartController extends BaseController
         return toAjax(customersStartService.addCustomersStart(ids));
     }
 
+    /**
+     * 经销商解冻查询接口
+     */
+    @PostMapping("/addFreeCustomer")
+    @ResponseBody
+    public String addFreeCustomer(String customer) {
+        try {
+            hanaOrderComponent.hanaFreezeCustomer(customer);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return "";
+    }
+
     /**
      * 修改经销商启用
      */

suishenbang-quartz/src/main/java/com/dgtly/quartz/task/RyTask.java

@@ -126,7 +126,7 @@ public class RyTask
 
     /**HANA已冻结经销商**/
     public void hanaFreezeCustomer()throws Exception{
-        hanaOrderComponent.hanaFreezeCustomer();
+        hanaOrderComponent.hanaFreezeCustomer("");
     }
 
 

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/ESign/ESignHttpUtil.java

@@ -33,7 +33,9 @@ public class ESignHttpUtil {
      */
     public JSONObject doPostGetJson(ESignUrl eurl, JSONObject param,String ...querys){
         String url = eSignConfig.getUrl(eurl,querys);
+        log.info("开始调用E请求地址:{}", url);
         String str = doPost(url,param.toJSONString());
+        log.info("调用E请求地址返回结果:{}", str);
         JSONObject json =JSONObject.parseObject(str);
         int code = json.getInteger("code");
         if(code==30500156) {