From 1d0814a457b5e4c5753cdf4d41868b71ff5d9963 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Fri, 15 Nov 2024 17:49:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hiver-admin/test-output/test-report.html | 18 ++-- .../cc/hiver/core/entity/LogiticsCompany.java | 3 + .../impl/LogisticsAddressBookServiceImpl.java | 3 + .../vo/LogisticsAddressBookQueryVo.java | 1 + .../controller/LogisticsOrderController.java | 25 +++++ .../logisticsorder/entity/LogisticsOrder.java | 4 + .../mapper/LogisticsOrderMapper.java | 9 ++ .../service/LogisticsOrderService.java | 9 ++ .../impl/LogisticsOrderServiceImpl.java | 16 +++ .../vo/LogisticsOrderQueryVo.java | 12 +++ .../LogiticsCompanyServiceImpl.java | 24 ++++- .../resources/mapper/LogisticsOrderMapper.xml | 100 +++++++++++++----- .../controller/LogiticsCompanyController.java | 1 - .../java/cc/hiver/mall/utils/AliOcrUtil.java | 10 +- 14 files changed, 191 insertions(+), 44 deletions(-) diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 1531e2da..06aeeaac 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -5,7 +5,7 @@ -Hiver���Ա��� +HiverԱ @@ -35,7 +35,7 @@ Hiver
  • -ʮһ�� 10, 2024 22:06:39 +ʮһ 15, 2024 17:26:52
    • @@ -84,7 +84,7 @@

    passTest

    -

    22:06:39 ���� / 0.016 secs

    +

    17:26:54 / 0.023 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -11.10.2024 22:06:39 -11.10.2024 22:06:39 -0.016 secs +11.15.2024 17:26:54 +11.15.2024 17:26:54 +0.023 secs
    @@ -104,7 +104,7 @@ Pass - 22:06:39 + 17:26:54 Test passed @@ -128,13 +128,13 @@

    Started

    -

    ʮһ�� 10, 2024 22:06:39

    +

    ʮһ 15, 2024 17:26:52

    Ended

    -

    ʮһ�� 10, 2024 22:06:39

    +

    ʮһ 15, 2024 17:26:54

    diff --git a/hiver-core/src/main/java/cc/hiver/core/entity/LogiticsCompany.java b/hiver-core/src/main/java/cc/hiver/core/entity/LogiticsCompany.java index 726ece89..159c7a6c 100644 --- a/hiver-core/src/main/java/cc/hiver/core/entity/LogiticsCompany.java +++ b/hiver-core/src/main/java/cc/hiver/core/entity/LogiticsCompany.java @@ -107,6 +107,9 @@ public class LogiticsCompany extends HiverBaseEntity { @ApiModelProperty(value = "是否支持上门取货：0：否；1：是") private Integer canToDoor = 0; + @ApiModelProperty(value = "打印方式") + private String printMethod; + @Transient @TableField(exist = false) @ApiModelProperty(value = "物流公司id") diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java index b795087c..274eb56d 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsaddressbook/service/impl/LogisticsAddressBookServiceImpl.java @@ -114,6 +114,9 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl { StatisticsVo getLogisticsOrderStatistics(@Param("logisticsOrderQueryVo") LogisticsOrderQueryVo logisticsOrderQueryVo); int getCustomerCount(@Param("logisticsOrderQueryVo") LogisticsOrderQueryVo logisticsOrderQueryVo); + + /** + * 批量更新订单状态 + * @author 王富康 + * @date 2024/11/15 + * @param orderIdList + * @param orderStatus + */ + void batchUpdateOrderStatus(@Param("orderIdList")List orderIdList,@Param("orderStatus") String orderStatus); } diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/LogisticsOrderService.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/LogisticsOrderService.java index 9c6ca9c6..f668be09 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/LogisticsOrderService.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/LogisticsOrderService.java @@ -52,4 +52,13 @@ public interface LogisticsOrderService extends IService { * @return StatisticsVo */ StatisticsVo getLogisticsOrderStatistics(LogisticsOrderQueryVo logisticsOrderQueryVo); + + /** + * 批量更新订单状态 + * @author 王富康 + * @date 2024/11/15 + * @param orderIds + * @param orderStatus + */ + void batchUpdateOrderStatus(String orderIds, String orderStatus); } diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/impl/LogisticsOrderServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/impl/LogisticsOrderServiceImpl.java index f9a8de9c..6967b14e 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/impl/LogisticsOrderServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/service/impl/LogisticsOrderServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -126,4 +127,19 @@ public class LogisticsOrderServiceImpl extends ServiceImpl + final List orderIdList = Arrays.asList(orderIds.split(",")); + logisticsOrderMapper.batchUpdateOrderStatus(orderIdList, orderStatus); + } } diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java index f56b4f76..615f4284 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/LogisticsOrderQueryVo.java @@ -27,12 +27,18 @@ public class LogisticsOrderQueryVo extends HiverBasePageQuery { @ApiModelProperty(value = "到达站id") private String arrivalStationId; + @ApiModelProperty(value = "发货人Id") + private String shipperId; + @ApiModelProperty(value = "发货人名称") private String shipperName; @ApiModelProperty(value = "发货人联系方式") private String shipperMobile; + @ApiModelProperty(value = "收货人名称") + private String receiverId; + @ApiModelProperty(value = "收货人名称") private String receiverName; @@ -78,5 +84,11 @@ public class LogisticsOrderQueryVo extends HiverBasePageQuery { @ApiModelProperty(value = "是否有修改记录的筛选") private String isUpdate; + @ApiModelProperty(value = "订单状态") + private String orderStatus; + + @ApiModelProperty(value = "修改记录数") + private String changeCount; + } diff --git a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/LogiticsCompanyServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/LogiticsCompanyServiceImpl.java index 8f4c633a..0589b044 100644 --- a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/LogiticsCompanyServiceImpl.java +++ b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/LogiticsCompanyServiceImpl.java @@ -19,6 +19,8 @@ import cc.hiver.core.base.HiverBaseDao; import cc.hiver.core.common.constant.CommonConstant; import cc.hiver.core.dao.LogiticsCompanyDao; import cc.hiver.core.entity.LogiticsCompany; +import cc.hiver.core.logisticsuser.entity.LogisticsUser; +import cc.hiver.core.logisticsuser.service.LogisticsUserService; import cc.hiver.core.service.LogiticsCompanyService; import cc.hiver.core.vo.LogiticsCompanyQueryVo; import cn.hutool.core.util.StrUtil; @@ -46,6 +48,9 @@ public class LogiticsCompanyServiceImpl implements LogiticsCompanyService { @Autowired private LogiticsCompanyDao companyDao; + @Autowired + private LogisticsUserService logisticsUserService; + @Override public HiverBaseDao getRepository() { return companyDao; @@ -106,7 +111,24 @@ public class LogiticsCompanyServiceImpl implements LogiticsCompanyService { @Override public List findByMobile(String mobile) { - return companyDao.findByMobile(mobile); + List logiticsCompanyList = companyDao.findByMobile(mobile); + if (logiticsCompanyList.isEmpty()) { + // 物流公司主表中没有查询到信息，查询物流公司员工信息 + final LogisticsUser logisticsUser = logisticsUserService.findByMobile(mobile); + if(logisticsUser == null){ + return new ArrayList<>(); + }else{ + final LogiticsCompany logiticsCompany = companyDao.getById(logisticsUser.getCompanyId()); + // 将员工的信息封装至公司信息中 + logiticsCompany.setId(logisticsUser.getId()); + logiticsCompany.setPassword(logisticsUser.getPassword()); + logiticsCompany.setUsername(logisticsUser.getMobile()); + logiticsCompany.setCompanyId(logisticsUser.getCompanyId()); + logiticsCompanyList.add(logiticsCompany); + return logiticsCompanyList; + } + } + return logiticsCompanyList; } @Override diff --git a/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml index 03c246f7..eb78297a 100644 --- a/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml @@ -40,13 +40,15 @@ + id, create_by, create_by_name, create_time, del_flag, update_by, update_time,company_id, company_name, circuit_id, circuit_name, shipper_name, shipper_mobile, shipper_address, receiver_name, receiver_mobile, receiver_address, go_station_id, go_station_name, arrival_station_id, arrival_station_name, weight, count, freight, premium, - transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, receiving_user_name,image_path, payment_for_goods, transfer_addition + transit_fee, tips, method_of_settlement, cost, all_cost, order_number, object_name, remark, receiving_user_id, + receiving_user_name,image_path, payment_for_goods, transfer_addition,order_status + + WITH OrderChangeCount AS ( + SELECT + order_id, + COUNT(*) AS change_count + FROM + t_logistics_order_change_log + GROUP BY + order_id + ) + select - - from t_logistics_order + t.id, t.create_by, + t.create_by_name, t.create_time, t.del_flag, t.update_by, t.update_time, t.company_id, t.company_name, t.circuit_id, t.circuit_name, + t.shipper_name, t.shipper_mobile, t.shipper_address, t.receiver_name, t.receiver_mobile, t.receiver_address, + t.go_station_id, t.go_station_name, t.arrival_station_id, t.arrival_station_name, t.weight, t.count, t.freight, t.premium, + t.transit_fee, t.tips, t.method_of_settlement, t.cost, t.all_cost, t.order_number, t.object_name, t.remark, t.receiving_user_id, + t.receiving_user_name,t.image_path, t.payment_for_goods, t.transfer_addition,t.order_status, + COALESCE(occ.change_count, 0) AS change_count + from t_logistics_order t + LEFT JOIN + OrderChangeCount occ + ON + t.id = occ.order_id - AND company_id = #{queryParams.companyId} + AND t.company_id = #{queryParams.companyId} - AND circuit_id = #{queryParams.circuitId} + AND t.circuit_id = #{queryParams.circuitId} - AND go_station_id = #{queryParams.goStationId} + AND t.go_station_id = #{queryParams.goStationId} - AND arrival_station_id = #{queryParams.arrivalStationId} + AND t.arrival_station_id = #{queryParams.arrivalStationId} + + + AND t.shipper_id = #{queryParams.shipperId} + + + AND t.receiver_id = #{queryParams.receiverId} - AND company_name like concat('%',#{queryParams.companyName},'%') + AND t.company_name like concat('%',#{queryParams.companyName},'%') - AND circuit_name like concat('%',#{queryParams.circuitName},'%') + AND t.circuit_name like concat('%',#{queryParams.circuitName},'%') - AND shipper_name like concat('%',#{queryParams.shipperName},'%') + AND t.shipper_name like concat('%',#{queryParams.shipperName},'%') - AND shipper_mobile like concat('%',#{queryParams.shipperMobile},'%') + AND t.shipper_mobile like concat('%',#{queryParams.shipperMobile},'%') - AND shipper_address like concat('%',#{queryParams.shipperAddress},'%') + AND t.shipper_address like concat('%',#{queryParams.shipperAddress},'%') - AND receiver_name like concat('%',#{queryParams.receiverName},'%') + AND t.receiver_name like concat('%',#{queryParams.receiverName},'%') - AND receiver_mobile like concat('%',#{queryParams.receiverMobile},'%') + AND t.receiver_mobile like concat('%',#{queryParams.receiverMobile},'%') - AND go_station_name like concat('%',#{queryParams.goStationName},'%') + AND t.go_station_name like concat('%',#{queryParams.goStationName},'%') - AND arrival_station_name like concat('%',#{queryParams.arrivalStationName},'%') + AND t.arrival_station_name like concat('%',#{queryParams.arrivalStationName},'%') - AND order_number like concat('%',#{queryParams.orderNumber},'%') + AND t.order_number like concat('%',#{queryParams.orderNumber},'%') - AND create_time BETWEEN #{queryParams.startDate} AND #{queryParams.endDate} + AND t.create_time BETWEEN #{queryParams.startDate} AND #{queryParams.endDate} and ( - company_name like concat('%',#{queryParams.searchStr},'%') - or circuit_name like concat('%',#{queryParams.searchStr},'%') - or shipper_name like concat('%',#{queryParams.searchStr},'%') - or shipper_mobile like concat('%',#{queryParams.searchStr},'%') - or receiver_name like concat('%',#{queryParams.searchStr},'%') - or receiver_mobile like concat('%',#{queryParams.searchStr},'%') + t.company_name like concat('%',#{queryParams.searchStr},'%') + or t.circuit_name like concat('%',#{queryParams.searchStr},'%') + or t.shipper_id like concat('%',#{queryParams.searchStr},'%') + or t.shipper_name like concat('%',#{queryParams.searchStr},'%') + or t.shipper_mobile like concat('%',#{queryParams.searchStr},'%') + or t.receiver_id like concat('%',#{queryParams.searchStr},'%') + or t.receiver_name like concat('%',#{queryParams.searchStr},'%') + or t.receiver_mobile like concat('%',#{queryParams.searchStr},'%') + or t.order_status like concat('%',#{queryParams.searchStr},'%') ) @@ -150,12 +183,13 @@ and exists ( select 1 from t_logistics_order_change_log tloc - where id = tloc.order_id + where t.id = tloc.order_id ) ORDER BY - create_time desc + change_count desc, + t.create_time desc @@ -212,4 +246,14 @@ AND arrival_station_id = #{logisticsOrderQueryVo.arrivalStationId} + + + + update t_logistics_order + set order_status = #{orderStatus,jdbcType=VARCHAR} + where id in + + #{listItem} + + \ No newline at end of file diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/LogiticsCompanyController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/LogiticsCompanyController.java index c42ced08..77c89fc8 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/LogiticsCompanyController.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/LogiticsCompanyController.java @@ -152,7 +152,6 @@ public class LogiticsCompanyController { company.setDepoBal(oldCompanyDepoBal.add(company.getDepoNum())); company.setDepoNum(new BigDecimal(0)); } - companyService.update(company); return ResultUtil.success("编辑成功"); } diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java index 33acbac2..adef1ba3 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/utils/AliOcrUtil.java @@ -851,7 +851,7 @@ public class AliOcrUtil { msgManager.add(userMsg); stopWatch.start("开始回答"); final QwenParam param = - QwenParam.builder().model("qwen-turbo-0919").messages(msgManager.get()) + QwenParam.builder().model("qwen-coder-turbo").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.7F) @@ -903,7 +903,7 @@ public class AliOcrUtil { msgManager.add(systemMsg); msgManager.add(userMsg); final QwenParam param = - QwenParam.builder().model("qwen-turbo-0919").messages(msgManager.get()) + QwenParam.builder().model("qwen-coder-turbo").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.7F) @@ -945,7 +945,7 @@ public class AliOcrUtil { msgManager.add(userMsg); stopWatch.start("开始回答"); final QwenParam param = - QwenParam.builder().model("qwen-turbo-0919").messages(msgManager.get()) + QwenParam.builder().model("qwen-coder-turbo").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .seed(1234) .temperature(0.85F) @@ -1224,7 +1224,7 @@ public class AliOcrUtil { msgManager.add(userMsg); stopWatch.start("开始回答"); final QwenParam param = - QwenParam.builder().model("qwen-turbo-0919").messages(msgManager.get()) + QwenParam.builder().model("qwen-coder-turbo").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .build(); final GenerationResult result = gen.call(param); @@ -1267,7 +1267,7 @@ public class AliOcrUtil { msgManager.add(userMsg); stopWatch.start("开始回答"); final QwenParam param = - QwenParam.builder().model("qwen-turbo-0919").messages(msgManager.get()) + QwenParam.builder().model("qwen-coder-turbo").messages(msgManager.get()) .resultFormat(QwenParam.ResultFormat.MESSAGE) .build(); final GenerationResult result = gen.call(param);