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

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/entity/KwmAddress.java

@@ -60,6 +60,8 @@ public class KwmAddress implements Serializable {
      */
     private String cityName;
 
+
+
     /**
      * 详细地址
      */

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/QueryByEntReqVo.java

@@ -25,4 +25,9 @@ public class QueryByEntReqVo implements Serializable {
      * 地址名
      */
     private String cityName;
+
+    /**
+     * 地址名
+     */
+    private String cityTrueName;
 }

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -27,9 +27,12 @@ import com.sckw.manage.model.entity.KwmAddress;
 import com.sckw.manage.model.vo.req.*;
 import com.sckw.manage.model.vo.res.AddressDetailResVo;
 import com.sckw.manage.model.vo.res.AddressQueryResVo;
+import com.sckw.system.api.RemoteSystemService;
+import com.sckw.system.api.model.dto.res.EntCacheResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +54,9 @@ public class KwmAddressService {
 
     @Autowired
     private RemoteManageServiceImpl remoteManageService;
+
+    @DubboReference(version = "1.0.0", group = "design", check = false)
+    private RemoteSystemService remoteSystemService;
     /**
      * @param reqVo 分页入参
      * @return HttpResult
@@ -341,9 +347,17 @@ public class KwmAddressService {
      */
     public List<AddressQueryResVo> queryByEnt(QueryByEntReqVo reqVo) {
         LambdaQueryWrapper<KwmAddress> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(KwmAddress::getEntId, reqVo.getId());
+        //wrapper.eq(KwmAddress::getEntId, reqVo.getId());
         wrapper.eq(KwmAddress::getDelFlag, Global.NO);
-
+        List<Long> ids = new ArrayList<>();
+        ids.add(reqVo.getId());
+        Map<Long, EntCacheResDto> entCacheResDtos = remoteSystemService.queryEntTreeByIds(ids);
+        EntCacheResDto id = entCacheResDtos.get(reqVo.getId());
+        wrapper.eq(KwmAddress::getEntId, id.getId());
+        //entCacheResDtos.get();
+        if (StringUtils.isNotBlank(reqVo.getCityTrueName())) {
+            wrapper.and(wp -> wp.eq(KwmAddress::getName, reqVo.getCityTrueName()));
+        }
         if (StringUtils.isNotBlank(reqVo.getCityName())) {
             wrapper.and(wp -> wp.like(KwmAddress::getCityName, reqVo.getCityName()).or().
                     like(KwmAddress::getDetailAddress, reqVo.getCityName()));

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsRoleService.java

@@ -8,6 +8,7 @@ import com.sckw.core.exception.SystemException;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
+import com.sckw.core.utils.BeanUtils;
 import com.sckw.core.utils.CollectionUtils;
 import com.sckw.core.utils.IdWorker;
 import com.sckw.core.utils.StringUtils;
@@ -258,6 +259,14 @@ public class KwsRoleService {
         roleBindMenuReqVo.setEntId(kwsDept.getEntId());
         roleBindMenuReqVo.setMenuIds(reqVo.getMenuIds());
         kwsMenuService.roleBindMenu(roleBindMenuReqVo);
+        //修改权限名称与备注信息
+        KwsRole kwsRoleTable = new KwsRole();
+        kwsRoleTable.setId(reqVo.getId());
+        kwsRoleTable.setName(reqVo.getName());
+        kwsRoleTable.setRemark(reqVo.getRemark());
+        if (kwsRoleDao.update(kwsRoleTable) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
+        }
 //        List<KwsUser> kwsUsers = kwsUserDao.selectByRoleIds(Collections.singletonList(reqVo.getId()));
 //
 //        //删除以前的角色

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

@@ -532,10 +532,10 @@ public class AcceptCarriageOrderService {
 //        order.setLossUnit(bo.getLossUnit());
         order.setLossUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.UNIT_TYPE.getType(), bo.getLossUnit()).getValue());
-        order.setGoodsPrice(new BigDecimal(bo.getGoodsPrice()));
+        order.setGoodsPrice(bo.getGoodsPrice() == null ? null : new BigDecimal(bo.getGoodsPrice()));
         order.setGoodsPriceUnit(remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()) == null ?
                 null : remoteSystemService.queryDictByTypeAndValue(DictTypeEnum.PRICE_TYPE.getType(), bo.getGoodsPriceUnit()).getValue());
-        order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
+//        order.setGoodsPriceUnit(bo.getGoodsPriceUnit());
         order.setStartTime(bo.getShipmentsDateTime());
         order.setEndTime(bo.getReceiveGoodsDateTime());
         order.setRemark(bo.getRemark());

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

@@ -743,10 +743,10 @@ public class ConsignOrderService {
         //业务汇总类型
         busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
         //操作对象（1新增/2修改/3替换数据）
-        busSum.setMethod(2);
+//        busSum.setMethod(2);
         //业务汇总数据对象
         busSum.setObject(lOrder);
-        busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
+//        busSum.setBusSumType(BusinessTypeEnum.LOGISTICS_ORDER_TYPE.getName());
         busSum.setMethod(NumberConstant.TWO);
         streamBridge.send("sckw-busSum", JSON.toJSONString(busSum));
     }
@@ -915,9 +915,10 @@ public class ConsignOrderService {
     /**
      * 托运订单-新建订单
      *
-     * @param addOrderDTO
+     * @param addOrderDTO   页面传递数据
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult addOrder(AddOrderDTO addOrderDTO) throws ParseException {
         HttpResult httpResult = ValidUtil.serviceValid(addOrderDTO);
         if (!String.valueOf(HttpStatus.SUCCESS_CODE).equals(String.valueOf(httpResult.getCode()))) {
@@ -934,10 +935,10 @@ public class ConsignOrderService {
         contractList.add(Long.parseLong(addOrderDTO.getContractId()));
         Map<Long, ContractCommonInfoResDto> longContractCommonInfoResDtoMap = remoteContractService.queryContractBaseInfo(contractList);
         if (CollectionUtils.isEmpty(longContractCommonInfoResDtoMap)) {
-            throw new RuntimeException("托运订单新建订单-并未有对应合同,应先签约合同");
+            throw new BusinessException("托运订单新建订单-并未有对应合同,应先签约合同");
         }
         if (longContractCommonInfoResDtoMap.get(Long.parseLong(addOrderDTO.getContractId())) == null) {
-            throw new RuntimeException("托运订单新建订单-并未有对应合同,应先签约合同");
+            throw new BusinessException("托运订单新建订单-并未有对应合同,应先签约合同");
         }
         ContractCommonInfoResDto infoResDto = longContractCommonInfoResDtoMap.get(Long.parseLong(addOrderDTO.getContractId()));
         /**状态判断

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

@@ -774,15 +774,17 @@ public class LogisticsConsignmentService {
         for (String id : stringList) {
             List<OrderCarDTO> list = waybillOrderMapper.selectWaybillOrderCarListNotPage(id);
             List<String> collect = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());
-            Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
-            for (OrderCarDTO orderCarDTO : list) {
+            if (CollectionUtils.isNotEmpty(collect)) {
+                Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
+                for (OrderCarDTO orderCarDTO : list) {
 //            orderCarDTO.setDriverId(String.valueOf(orderCarDTO.getDriverId()));
 //            orderCarDTO.setDriverName(orderCarDTO.getDriverName());
 //            orderCarDTO.setDriverPhone(orderCarDTO.getDriverPhone());
 //            orderCarDTO.setDriverCard(orderCarDTO.getDriverCard());
-                orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
-                        null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
-                        null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
+                    orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
+                            null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
+                            null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
+                }
             }
             if (CollectionUtils.isNotEmpty(list)) {
                 returnList.addAll(list);

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -139,7 +139,7 @@
         a.update_time AS updateTime
         FROM
         kwt_logistics_order a
-        LEFT JOIN kwt_logistics_order_goods b ON a.id = b.l_order_id
+        LEFT JOIN kwt_logistics_order_goods b ON a.id = b.l_order_id and a.bind_status = '0'
 <!--        LEFT JOIN kwt_logistics_order_unit d ON a.id = d.l_order_id-->
         LEFT JOIN kwt_logistics_order_contract c ON a.id = c.l_order_id
 <!--        LEFT JOIN ( SELECT l_order_id FROM kwt_logistics_order_unit WHERE unit_type = 1 AND ent_id = #{entId} ) g ON a.id = g.l_order_id-->