Merge branch 'v1' of http://git.quantgroup.cn/QG/cash-loan-flow-boss into v1

# By junquan.wang@quantgroup.cn
# Via junquan.wang@quantgroup.cn
* 'v1' of http://git.quantgroup.cn/QG/cash-loan-flow-boss:
  清除用户活跃订单
  清除用户活跃订单

Conflicts:
	src/main/java/cn/quantgroup/cashloanflowboss/api/order/controller/OrderController.java

src/main/java/cn/quantgroup/cashloanflowboss/api/user/controller/UserController.java

@@ -124,23 +124,23 @@ public class UserController {
     /**
      * 清除用户活跃订单
      *
-     * @param phoneNo 用户ID
+     * @param mobile 用户ID
      * @return
      */
     @PutMapping("/order/clean")
-    public Boolean cleanUserOrder(@RequestParam @Valid @NotEmpty(message = "无效的用户手机号") String phoneNo) {
-        return this.xyqbUserService.cleanUserOrder(phoneNo);
+    public Boolean cleanUserOrder(@RequestParam @Valid @NotEmpty(message = "无效的用户手机号") String mobile) {
+        return this.xyqbUserService.cleanUserOrder(mobile);
     }
 
   /**
    * 删除订单
    *
-   * @param phoneNo 用户ID
+   * @param mobile 用户ID
    * @return
    */
-  @PutMapping("/delete/userid")
-  public Boolean deleteByUserId(@RequestParam @Valid @NotEmpty(message = "无效的用户手机号") String phoneNo) {
-    return this.xyqbUserService.deleteByUserId(phoneNo);
+  @PutMapping("/info/clean")
+  public Boolean deleteByUserId(@RequestParam @Valid @NotEmpty(message = "无效的用户手机号") String mobile) {
+    return this.xyqbUserService.deleteByUserId(mobile);
   }
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/user/service/XyqbUserServiceImpl.java

@@ -13,6 +13,7 @@ import cn.quantgroup.user.retbean.XUser;
 import cn.quantgroup.user.retbean.XUserDetail;
 import cn.quantgroup.user.retbean.XUserExtInfo;
 import cn.quantgroup.user.vo.UserSysResult;
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -180,7 +181,8 @@ public class XyqbUserServiceImpl implements XyqbUserService {
         cancel_list.add("delete from user_operation_history where user_id="+userId);
         data.put("sql",cancel_list);
         String cancel_result = jolyneCenter.executeXYQBSQL(JSONTools.serialize(data));
-        return "success".equals(cancel_result);
+        JSONObject resp = JSONObject.parseObject(cancel_result);
+        return (Objects.nonNull(resp) && resp.containsKey("code"))?"0000".equals(resp.get("code")):false;
     }
 
     @Override public Boolean deleteByUserId(String phoneNo) {