Merge remote-tracking branch 'origin/dev' into dev

sckw-common/sckw-common-core/src/main/java/com/sckw/core/exception/GlobalSystemExceptionHandler.java

@@ -73,7 +73,7 @@ public class GlobalSystemExceptionHandler {
     @ExceptionHandler(NotLoginException.class)
     public HttpResult notLoginException(NotLoginException ex) {
         log.error("用户未登录, message={}, param={}", ex.getMsg(), ex.getParam());
-        return HttpResult.error(HttpStatus.UN_LOGIN_CODE, HttpStatus.UN_LOGIN_MESSAGE, ex.getMessage());
+        return HttpResult.error(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.UN_LOGIN_MESSAGE, ex.getMessage());
     }
 
     @ResponseBody

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilter.java

@@ -73,14 +73,14 @@ public class LoginFilter implements Filter {
         //token解析后为用户id
         String token = request.getHeader(RequestConstant.TOKEN);
         if (StringUtils.isBlank(token)) {
-            throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.TOKEN_MISSING);
+            throw new SystemException(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.TOKEN_MISSING);
         }
 
         String key;
         try {
             key = EncryUtil.descry(Global.PRI_KEY, token);
         } catch (Exception e) {
-            throw new SystemException(HttpStatus.PARAMETERS_MISSING_CODE, HttpStatus.TOKEN_ERROR);
+            throw new SystemException(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.TOKEN_ERROR);
         }
 
         //从redis获取用户信息
@@ -88,7 +88,7 @@ public class LoginFilter implements Filter {
         String systemType = request.getHeader(RequestConstant.SYSTEM_TYPE);
         String userInfo = RedissonUtils.getString(Global.getFullUserLoginKey(Integer.parseInt(systemType), Long.parseLong(key), clientType));
         if (StringUtils.isBlank(userInfo)) {
-            throw new SystemException(HttpStatus.UN_LOGIN_CODE, HttpStatus.UN_LOGIN_MESSAGE);
+            throw new SystemException(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.UN_LOGIN_MESSAGE);
         }
 
         //将redis里的用户信息存入内存中，避免业务操作多次从redis获取值*/

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/RequestCheckFilter.java

@@ -83,7 +83,7 @@ public class RequestCheckFilter implements Filter {
         /*2、校验token**/
         /*2.1、校验token非空*/
         if (StringUtils.isBlank(token)) {
-            ResponseUtil.writer(response, HttpResult.error(HttpStatus.UN_LOGIN_CODE, HttpStatus.UN_LOGIN_MESSAGE));
+            ResponseUtil.writer(response, HttpResult.error(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.UN_LOGIN_MESSAGE));
             return;
         }
 
@@ -104,7 +104,7 @@ public class RequestCheckFilter implements Filter {
 
         /*2.4、请求token和redis中token不一致,说明账号在别处登录了*/
         if (!token.equals(redisUserToken)) {
-            ResponseUtil.writer(response, HttpResult.error(HttpStatus.ACCOUNT_OTHER_LOGIN_CODE, HttpStatus.ACCOUNT_OTHER_LOGIN_MESSAGE));
+            ResponseUtil.writer(response, HttpResult.error(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.ACCOUNT_OTHER_LOGIN_MESSAGE));
             return;
         }
 
@@ -116,7 +116,7 @@ public class RequestCheckFilter implements Filter {
             ResponseUtil.writer(response, HttpResult.error(HttpStatus.TOKEN_INVALID_CODE, HttpStatus.TOKEN_INVALID_MESSAGE));
             return;
         }
-
+        loginUserInfo.setClientType(clientType);
 
         //校验用户账号是否冻结
         if (loginUserInfo.getStatus() == Global.YES) {
@@ -198,7 +198,7 @@ public class RequestCheckFilter implements Filter {
     }
 
     public static void main(String[] args) {
-        Map<String, Object> tokenMap = EncryUtil.descryV2(Global.PRI_KEY, "dade5058e78847ca5672263c5b821fc09d06083611ab0f6d076af88f082f0538569486c2369c2aae99f2a8fc7a7de07b57aa7ffadb3c958ef83cb50a10819703d3cb745c501326d65d50ed5aba830326eb64a75b0479f896763a9810e847f430");
+        Map<String, Object> tokenMap = EncryUtil.descryV2(Global.PRI_KEY, "afc3fc350d5c17e52beba3bcd631eaca9f5f440509f72b182880a429b1b9b22b53154436ec72865566320514f3a6e39389c2ed412180c90b07f6ff66c12a5e139ed05793cf37d580ae9a2a166ddd79d6b7cd10e209d78c6eee9381d878df29f7");
         System.out.println(tokenMap);
     }
 }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/constant/HttpStatus.java

@@ -42,7 +42,6 @@ public class HttpStatus {
     public static final String ACCOUNT_UNFREEZE = "用户账号不能重复解冻！";
     public static final String PWD_MISSING = "密码不能为空！";
     public static final String TOKEN_MISSING = "token不能为空！";
-    public static final String TOKEN_INVAILD = "无效token";
     public static final String TOKEN_ERROR = "非法token！";
     public static final String CAPCHA_ERROR = "验证码无效！";
     public static final String ADDRESS_EXISTS = "地点已存在，不可重复！";

sckw-common/sckw-common-redis/src/main/java/com/sckw/redis/constant/RedisConstant.java

@@ -68,6 +68,22 @@ public class RedisConstant {
     public static final String WAYBILL_NO_GENERATE_KEY = "order:waybill:no:generate:%s";
 
 
+    /**
+     * 完结物流订单key
+     */
+    public static final String LOGISTICS_ORDER_FINISH_KEY = "order:logistics:no:finish:%s";
+
+    /**
+     * 取消物流订单key
+     */
+    public static final String LOGISTICS_ORDER_CANCEL_KEY = "order:logistics:no:cancel:%s";
+
+    /**
+     * 物流订单分包锁key
+     */
+    public static final String LOGISTICS_ORDER_SUBCONTRACT_KEY = "order:logistics:no:subcontract:%s";
+
+
     /**
      * 消费请求有效时间（秒）
      */

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/SysDictGroupResDto.java

@@ -36,6 +36,11 @@ public class SysDictGroupResDto implements Serializable {
      */
     private String label;
 
+    /**
+     * url
+     */
+    private String url;
+
     /**
      * 下级
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -243,17 +243,7 @@ public class KwcContractTradeService {
         long contactId = new IdWorker(1L).nextId();
         kwcContractTrade.setId(contactId);
         kwcContractTrade.setStatus(ContractStatusEnum.SAVE.getCode());
-        String contractFile = reqVo.getContractFile();
-        if (StringUtils.isNotBlank(contractFile)) {
-            JSONArray jsonArray = JSONArray.parseArray(contractFile);
-            for (int n = 0; n < jsonArray.size(); n++) {
-                JSONObject jsonObject = jsonArray.getJSONObject(n);
-                String url = jsonObject.getString("url");
-                jsonObject.put("url", FileUtils.replaceAll(url));
-            }
-            kwcContractTrade.setSigningUrl(JSON.toJSONString(jsonArray));
-        }
-
+        kwcContractTrade.setSigningUrl(changeFile(reqVo.getContractFile()));
         if (kwcContractTradeMapper.insert(kwcContractTrade) <= 0) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
         }
@@ -266,6 +256,19 @@ public class KwcContractTradeService {
         return contactId;
     }
 
+    private String changeFile(String contractFile) {
+        if (StringUtils.isNotBlank(contractFile)) {
+            JSONArray jsonArray = JSONArray.parseArray(contractFile);
+            for (int n = 0; n < jsonArray.size(); n++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(n);
+                String url = jsonObject.getString("url");
+                jsonObject.put("url", FileUtils.replaceAll(url));
+            }
+            return JSON.toJSONString(jsonArray);
+        }
+        return null;
+    }
+
 
     private void checkParam(TradeBaseInfoReqVo baseInfo, List<TradeGoodsInfoReqVo> goodsInfo) {
         if (Objects.nonNull(baseInfo)) {
@@ -629,7 +632,6 @@ public class KwcContractTradeService {
         if (Objects.isNull(kwcContractTrade)) {
             throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.CONTRACT_NOT_EXISTS);
         }
-        KwcContractTrade param = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPid());
 
         TradeBaseInfoReqVo baseInfo = reqVo.getBaseInfo();
         kwcContractTrade.setEntId(LoginUserHolder.getEntId());
@@ -656,7 +658,7 @@ public class KwcContractTradeService {
             }
         }
         kwcContractTrade.setAmount(amountTotal);
-        kwcContractTrade.setSigningUrl(reqVo.getContractFile());
+        kwcContractTrade.setSigningUrl(changeFile(reqVo.getContractFile()));
         kwcContractTrade.setStatus(ContractStatusEnum.SAVE.getCode());
         kwcContractTrade.setUpdateBy(LoginUserHolder.getUserId());
         kwcContractTrade.setUpdateTime(date);

sckw-modules/sckw-operation/src/main/java/com/sckw/operation/service/BannerService.java

@@ -87,14 +87,20 @@ public class BannerService {
                 orderByDesc(KwoBanner::getDistrict,KwoBanner::getSort);
 
         if (Objects.nonNull(reqVo.getStartTime())) {
-            wrapper.ge(KwoBanner::getStartTime, reqVo.getStartTime());
+            wrapper.lt(KwoBanner::getStartTime, reqVo.getStartTime()).or().eq(KwoBanner::getStartTime,null);;
         }
         if(Objects.nonNull(reqVo.getDistrict())) {
             wrapper.eq(KwoBanner::getDistrict, reqVo.getDistrict());
         }
 
         if (Objects.nonNull(reqVo.getEndTime())) {
-            wrapper.lt(KwoBanner::getEntTime, DateUtil.offsetDay(reqVo.getEndTime(), 1));
+            wrapper.gt(KwoBanner::getEntTime, DateUtil.offsetDay(reqVo.getEndTime(), 1)).or().eq(KwoBanner::getEntTime,null);
+        }
+        if(Objects.nonNull(reqVo.getDistrict()))
+        {
+            Date date = new Date();
+            wrapper.lt(KwoBanner::getStartTime, date).or().eq(KwoBanner::getStartTime,null);
+            wrapper.gt(KwoBanner::getEntTime, date).or().eq(KwoBanner::getEntTime,null);
         }
 
         if (StringUtils.isNotBlank(reqVo.getIds())) {

sckw-modules/sckw-system/src/main/java/com/sckw/system/dubbo/RemoteSystemServiceImpl.java

@@ -8,6 +8,7 @@ import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.enums.EntTypeEnum;
 import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
+import com.sckw.core.utils.FileUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.system.api.RemoteSystemService;
@@ -307,6 +308,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
 
             SysDictGroupResDto sysDictGroupResDto = new SysDictGroupResDto();
             BeanUtils.copyProperties(first.get(), sysDictGroupResDto);
+            sysDictGroupResDto.setUrl(FileUtils.splice(sysDictGroupResDto.getUrl()));
             sysDictGroupResDto.setChild(getChild(sysDictGroupResDto.getId(), list));
             RedissonUtils.putString(key, JSON.toJSONString(sysDictGroupResDto), Global.COMMON_EXPIRE);
             return sysDictGroupResDto;
@@ -674,6 +676,7 @@ public class RemoteSystemServiceImpl implements RemoteSystemService {
             if (sysDict.getParentId().equals(String.valueOf(id))) {
                 SysDictGroupResDto sysDictGroupResDto = new SysDictGroupResDto();
                 BeanUtils.copyProperties(sysDict, sysDictGroupResDto);
+                sysDictGroupResDto.setUrl(FileUtils.splice(sysDictGroupResDto.getUrl()));
                 child.add(sysDictGroupResDto);
             }
         }