优化用户检索

src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java

@@ -67,6 +67,17 @@ public interface OrderMapper {
      */
     int countOrderByStatus(int status);
 
+    /**
+     * 统计某个时间段订单数量
+     * @param key
+     * @param start
+     * @param end
+     * @return
+     */
+    int countOrderTimeSection(@Param("key") String key,
+                              @Param("startTime") String start,
+                              @Param("endTime") String end);
+
     /**
      * 计算条件订单总额,返回 BigDecimal
      * @param cmap  ( 字段、条件 field,condition)

src/main/java/cn/chjyj/szwh/service/UserService.java

@@ -28,7 +28,7 @@ public interface UserService {
      * @param userIsli
      * @return
      */
-    User getApiUser(String userIsli);
+    User getApiUser(String userIsli,String token);
 
     /**
      * 新增用户

src/main/java/cn/chjyj/szwh/service/impl/UserServiceImpl.java

@@ -5,15 +5,25 @@ import cn.chjyj.szwh.mapper.UserMapper;
 import cn.chjyj.szwh.service.UserService;
 import cn.chjyj.szwh.utils.ProperUtils;
 import cn.chjyj.szwh.utils.RequestUtils;
+import cn.chjyj.szwh.utils.SignUtils;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class UserServiceImpl implements UserService {
+    /**
+     * 日志
+     */
+    private static Log log = LogFactory.getLog(UserServiceImpl.class);
+
     @Autowired
     private UserMapper userMapper;
 
@@ -35,20 +45,31 @@ public class UserServiceImpl implements UserService {
 
     /**
      * 远程获取用户信息
-     * @param userIsli
+     * @param userIsli 用户
+     * @param token 用户请求凭据
      * @return
      */
     @Override
-    public User getApiUser(String userIsli) {
+    public User getApiUser(String userIsli,String token) {
         String userHost= ProperUtils.getSzwhProp("REAL_URL");//用户主机
         if(StringUtils.isEmpty(userHost)){
             userHost="";
         }
         // 远程获取用户的信息
         String userUrl=userHost+"/slb/usermgt/v1/user-info/"+userIsli;
-        String token = "fdasfasd";//请求凭据；
+        log.info("rquest url:"+userUrl);
-        // 执行请求操作
+        // 创建签名
-        JSONObject json = RequestUtils.doGetUrlData(userHost,"api_token",token);
+        String sign= SignUtils.createSign("user_real");
+        log.info("user token:"+sign);
+        // 请求头
+        Map<String,Object> hmap =new HashMap();
+        hmap.put("token",sign);
+        hmap.put("Content-Type","application/json");
+
+        //执行请求
+        JSONObject json = RequestUtils.GetData(userUrl,hmap);
+        log.info("request result:"+json.toString());
+
         // 解析出用户
         User user = new User();
         user.setLegalsName(json.getString("leagal_name"));