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

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo1.java

@@ -91,6 +91,11 @@ public class LoginResVo1 implements Serializable {
      */
     private String entTypeNames;
 
+    /**
+     * 企业属性 （1供应商，2采购商，34PL物流，43PL物流）
+     */
+    private String entTypes;
+
     /**
      * 推送设备id
      */

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -441,6 +441,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setEntId(user.getEntId());
         loginRes.setFirmName(enterprise != null ? enterprise.getFirmName() : null);
         loginRes.setApproval(enterprise != null ? enterprise.getApproval() : null);
+        loginRes.setEntTypes(enterprise != null ? enterprise.getEntTypes() : null);
         loginRes.setEntTypeNames(enterprise != null ? enterprise.getEntTypeNames() : null);
         loginRes.setClientType(loginBase.getClientType());
         loginRes.setSystemType(loginBase.getSystemType());

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

@@ -141,14 +141,14 @@ public class LoginFilter implements Filter {
         //正常不存在企业等信息为空还能走到这里的请求，因为只能访问放开的权限，如果有恶意请求，这里会过滤
         if (StringUtils.isBlank(enterpriseInfo)) {
             LoginUserHolder.remove();
-            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENT_NOT_EXISTS);
+            throw new SystemException(HttpStatus.CODE_60603, HttpStatus.ENT_NOT_EXISTS);
         }
 
         //企业资料审批状态校验
         LoginEntInfo loginEntInfo = JSON.parseObject(enterpriseInfo, LoginEntInfo.class);
         if (!loginEntInfo.getValid()) {
             LoginUserHolder.remove();
-            throw new SystemException(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENTCERTIFICATES_INVAILD);
+            throw new SystemException(HttpStatus.CODE_60603, HttpStatus.ENTCERTIFICATES_INVAILD);
         }
         RedissonUtils.putString(Global.REDIS_ENTERPRISE_PREFIX + entId, enterpriseInfo, Global.PC_TOKEN_EXPIRE);
 //        int approval = loginEntInfo.getApproval();

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

@@ -136,7 +136,7 @@ public class RequestCheckFilter implements Filter {
 
             //校验用户企业审批状态
             if (!loginEntInfo.getValid() && !REGISTER.equals(requestUri)) {
-                ResponseUtil.writer(response, HttpResult.error(HttpStatus.QUERY_FAIL_CODE, HttpStatus.ENTCERTIFICATES_INVAILD));
+                ResponseUtil.writer(response, HttpResult.error(HttpStatus.CODE_60603, HttpStatus.ENTCERTIFICATES_INVAILD));
                 return;
             }
         }

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

@@ -49,6 +49,10 @@ public class HttpStatus {
 
     /**其他自定义状态码*/
     public static final int CODE_60603 = 60603;
+    public static final String ENTCERTIFICATES_INVAILD = "企业资质已失效";
+
+
+
     public static final int CODE_60604 = 60604;
     public static final int CODE_60605 = 60605;
     public static final int CODE_60606 = 60606;
@@ -131,7 +135,6 @@ public class HttpStatus {
     public static final String ENT_NOT_EXISTS = "企业信息不存在或已失效";
     public static final String DEPT_NOT_EXISTS = "机构信息不存在或已失效";
     public static final String ENTCERTIFICATES_NOT_EXISTS = "未查询到企业资质信息";
-    public static final String ENTCERTIFICATES_INVAILD = "企业资质已失效";
     public static final String ROLE_NOT_EXISTS = "未查询到关联的角色";
     public static final String USER_DEPT_NOT_EXISTS = "未查询到用户-机构关联信息";
     public static final String MENU_NOT_EXISTS = "未查询到菜单信息";

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderDriverVo.java

@@ -235,7 +235,7 @@ public class WaybillOrderDriverVo {
             }
         }
         //扣亏量=亏吨量-合理损耗值【要求大于0，如果小于0则扣亏货量取0】
-        BigDecimal deficitPrice = deficitAmount.subtract(loadAmount.multiply(loss).setScale(4, RoundingMode.HALF_UP));
+        BigDecimal deficitPrice = deficitAmount.subtract(loadAmount.multiply(loss).setScale(2, RoundingMode.HALF_UP));
         if (deficitPrice.doubleValue() <= 0) {
             return new BigDecimal(Global.AMOUNT);
         }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderService.java

@@ -1768,7 +1768,7 @@ public class KwtWaybillOrderService {
         }
 
         goodsPrice = goodsPrice == null ? new BigDecimal(Global.AMOUNT) : goodsPrice;
-        BigDecimal deficitLossAmount = deficitAmount.subtract(loadAmount.multiply(loss).setScale(4, RoundingMode.HALF_UP));
+        BigDecimal deficitLossAmount = deficitAmount.subtract(loadAmount.multiply(loss).setScale(2, RoundingMode.HALF_UP));
         //扣亏量=亏吨量-合理损耗值【要求大于0，如果小于0则扣亏货量取0】
         if (deficitLossAmount.doubleValue() <= 0) {
             return new BigDecimal(Global.AMOUNT);