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

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwWaybillOrder.java

@@ -156,6 +156,11 @@ public class SckwWaybillOrder{
      */
     private BigDecimal entrustAmount;
 
+    /**
+     * 托量单位
+     */
+    private String unit;
+
     /**
      * 装货重量
      */

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SckwSmsHandlerService.java

@@ -7,7 +7,6 @@ import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;
 import com.sckw.stream.enums.SmsCodeEnum;
 import com.sckw.stream.model.SckwSms;
-import com.sckw.stream.utils.SmsUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -46,8 +45,8 @@ public class SckwSmsHandlerService {
                 throw new BusinessException("请勿频繁获取短信验证码！");
             }
             RedissonUtils.putString(requestKey, String.valueOf(sckwSms.getParams().get("code")), RedisConstant.SMS_VERIFY_CODE_REQUEST_TIME);
-            //发送短信
-            SmsUtil.sendSms(sckwSms.getPhone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
+            //发送短信 TODO:测试暂时屏蔽，上线再放开
+//            SmsUtil.sendSms(sckwSms.getPhone(), sckwSms.getSignName(), sckwSms.getTemplateCode().getName(), JSON.toJSONString(sckwSms.getParams()));
             //放入缓存
             String valueKey = getKey(RedisConstant.MESSAGE_SMS_VERIFY_CODE_VALUE_KEY, type, phone);
             RedissonUtils.putString(valueKey, String.valueOf(sckwSms.getParams().get("code")), RedisConstant.SMS_VERIFY_CODE_VALID_TIME);

sckw-modules/sckw-message/src/main/java/com/sckw/message/service/SmsService.java

@@ -5,7 +5,6 @@ import com.sckw.core.common.enums.enums.DictEnum;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.Global;
-import com.sckw.core.utils.NumberUtils;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.message.model.vo.req.GetSmsVerifyCoderReqVO;
@@ -53,7 +52,9 @@ public class SmsService {
             throw new BusinessException("请勿频繁获取短信验证码！");
         }
         Map<String, Object> params = new HashMap<>(Global.NUMERICAL_SIXTEEN);
-        params.put("code", NumberUtils.createRandomVcode());
+        //TODO:测试先写死code码为123456，上线再放开
+        params.put("code", 123456);
+//        params.put("code", NumberUtils.createRandomVcode());
         SckwSms sckwSms = new SckwSms();
         sckwSms.setPhone(param.getPhone()).setType(type).setTemplateCode(SmsCodeEnum.VERIFICATION_CODE)
                 .setParams(params).setCreateBy(LoginUserHolder.getUserId());

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -167,10 +167,10 @@ public class KwoTradeOrderService {
                 list.add(unit);
                 if (Objects.equals(e.getUnitType(), DictEnum.TORDER_UNIT_TYPE_1.getValue())) {
                     order.setProcureEntId(e.getEntId()).setProcureTopEntId(unit.getTopEntId()).setProcureFirmName(e.getFirmName())
-                            .setProcureContacts(e.getContacts()).setProcurePhone(e.getPhone());
+                            .setProcureContacts(e.getContacts()).setProcurePhone(e.getPhone()).setProcureContactsId(e.getContactsId());
                 } else {
                     order.setSupplyEntId(e.getEntId()).setSupplyTopEntId(unit.getTopEntId()).setSupplyFirmName(e.getFirmName())
-                            .setSupplyContacts(e.getContacts()).setSupplyPhone(e.getPhone());
+                            .setSupplyContacts(e.getContacts()).setSupplyPhone(e.getPhone()).setSupplyContactsId(e.getContactsId());
                 }
             });
             kwoTradeOrderUnitService.insertBatch(list);

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

@@ -204,23 +204,26 @@ public class RemoteUserServiceImpl implements RemoteUserService {
             return Collections.emptyList();
         }
 
+        List<Long> list = new ArrayList<>();
+        list.add(id);
         List<KwsRoleResDto> kwsRoleResDtos = remoteBaseService.queryRoleInfoByUserId(id);
         if (CollectionUtils.isEmpty(kwsRoleResDtos)) {
-            return Collections.emptyList();
+            return list;
         }
 
         List<KwsAuthority> kwsAuthorities = remoteBaseService.queryAuthorityByRoles(kwsRoleResDtos.stream().map(KwsRoleResDto::getId).toList());
         if (CollectionUtils.isEmpty(kwsAuthorities)) {
-            return Collections.emptyList();
+            return list;
         }
 
         List<Long> deptIds = kwsAuthorities.stream().map(KwsAuthority::getDeptId).toList();
         List<KwsUser> kwsUsers = remoteBaseService.queryUserByDeptIds(deptIds);
         if(CollectionUtils.isEmpty(kwsUsers)) {
-            return Collections.emptyList();
+            return list;
         }
 
-        return kwsUsers.stream().filter(item -> item.getIsMain().equals(Global.NO)).map(KwsUser::getId).distinct().toList();
+        list.addAll(kwsUsers.stream().filter(item -> item.getIsMain().equals(Global.NO) && !item.getId().equals(id)).map(KwsUser::getId).distinct().toList());
+        return list;
     }
 
 

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -92,14 +92,13 @@
     from kws_enterprise a
     left join kws_user k on a.create_by = k.id
     left join kws_user ku on a.update_by = ku.id
-    left join kws_ent_type b on a.id = b.ent_id
+    left join kws_ent_type b on a.id = b.ent_id and b.del_flag = 0
     <if test="dto.typeList != null and dto.typeList.size() > 0">and b.type in
       <foreach collection="dto.typeList" item="item" open="(" close=")" separator=",">
         #{item}
       </foreach>
     </if>
     where a.del_flag = 0
-    and b.del_flag = 0
     <if test="dto.approval != null">
       and a.approval = #{dto.approval}
     </if>

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

@@ -766,6 +766,7 @@ public class KwtWaybillOrderService {
         order.setStartTime(sendCarDto.getLoadDateTime());
         order.setEndTime(sendCarDto.getUnloadDateTime());
         order.setEntrustAmount(new BigDecimal(sendCarDto.getEntrustAmount()));
+        order.setUnit(logisticsOrder.getUnit());
         order.setLoadAmount(new BigDecimal(Global.AMOUNT));
         order.setLoadTareAmount(new BigDecimal(Global.AMOUNT));
         order.setLoadGrossAmount(new BigDecimal(Global.AMOUNT));