diff --git a/hiver-admin/test-output/test-report.html b/hiver-admin/test-output/test-report.html index 9f7d11fc..2cceb583 100644 --- a/hiver-admin/test-output/test-report.html +++ b/hiver-admin/test-output/test-report.html @@ -35,7 +35,7 @@ Hiver
  • -十一月 18, 2024 00:59:02 +十一月 18, 2024 20:21:08
    • @@ -84,7 +84,7 @@

    passTest

    -

    00:59:03 上午 / 0.024 secs

    +

    20:21:09 下午 / 0.016 secs

    @@ -92,9 +92,9 @@
    #test-id=1
    passTest
    -11.18.2024 00:59:03 -11.18.2024 00:59:03 -0.024 secs +11.18.2024 20:21:09 +11.18.2024 20:21:09 +0.016 secs
    @@ -104,7 +104,7 @@ Pass - 0:59:03 + 20:21:09 Test passed @@ -128,13 +128,13 @@

    Started

    -

    十一月 18, 2024 00:59:02

    +

    十一月 18, 2024 20:21:08

    Ended

    -

    十一月 18, 2024 00:59:03

    +

    十一月 18, 2024 20:21:09

    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 4c450c82..65e1b824 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 @@ -27,7 +27,7 @@ import java.util.Map; * @Description: 鏀跺彂璐у湴鍧绨挎帴鍙 */ @Service -public class LogisticsAddressBookServiceImpl extends ServiceImplimplements LogisticsAddressBookService { +public class LogisticsAddressBookServiceImpl extends ServiceImpl implements LogisticsAddressBookService { @Autowired @@ -45,81 +45,74 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl list = new ArrayList<>(); //鏍规嵁鍚嶇О銆佺數璇濄佸湴鍧鏌ヨ鐪嬫槸涓嶆槸瀛樺湪锛屽鏋滀笉瀛樺湪鍒欐柊寤轰竴鏉 - if(StringUtils.isEmpty(logisticsOrder.getShipperId())){ - // 鏌ヨ锛岀劧鍚庡垽鏂柊澧 - final LambdaQueryWrapper stuQuery = new LambdaQueryWrapper<>(); - stuQuery.eq(LogisticsAddressBook::getShipperOrReceiverName, logisticsOrder.getShipperName()) - .eq(LogisticsAddressBook::getAddressType, 1) - .eq(LogisticsAddressBook::getMobile, logisticsOrder.getShipperMobile()) - .eq(LogisticsAddressBook::getAddressInfo, logisticsOrder.getShipperAddress()); - final Long count = getBaseMapper().selectCount(stuQuery); - - if(count == 0){ - // 鍒涘缓鍙戣揣浜哄湴鍧绨 - final LogisticsAddressBook shipperAddressBook = new LogisticsAddressBook(); - // 璁剧疆鍙戣揣浜哄悕绉帮紝浠庣墿娴佽鍗曠殑鍙戣揣浜哄悕绉颁腑鑾峰彇 - shipperAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); - // 璁剧疆鍦板潃淇℃伅锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鍦板潃鑾峰彇 - shipperAddressBook.setAddressInfo(logisticsOrder.getShipperAddress()); - // 璁剧疆鍦板潃绫诲瀷锛1琛ㄧず鍙戣揣浜哄湴鍧 - shipperAddressBook.setAddressType(1); - // 璁剧疆鍏徃ID锛屼粠鐗╂祦璁㈠崟涓幏鍙 - shipperAddressBook.setCompanyId(logisticsOrder.getCompanyId()); - // 璁剧疆鍏徃鍚嶇О锛屼粠鐗╂祦璁㈠崟涓幏鍙 - shipperAddressBook.setCompanyName(logisticsOrder.getCompanyName()); - // 璁剧疆鍒涘缓浜猴紝浠庣墿娴佽鍗曚腑鑾峰彇 - shipperAddressBook.setCreateBy(logisticsOrder.getCreateBy()); - // 璁剧疆鑱旂郴鐢佃瘽锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鎵嬫満淇℃伅涓幏鍙 - shipperAddressBook.setMobile(logisticsOrder.getShipperMobile()); - // 璁剧疆鏀跺彂璐т汉鍚嶇О锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鍚嶇О涓幏鍙 - shipperAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); - list.add(shipperAddressBook); - } - }else{ + if (StringUtils.isEmpty(logisticsOrder.getShipperId())) { + // 鍒涘缓鍙戣揣浜哄湴鍧绨 + final LogisticsAddressBook shipperAddressBook = new LogisticsAddressBook(); + // 璁剧疆鍙戣揣浜哄悕绉帮紝浠庣墿娴佽鍗曠殑鍙戣揣浜哄悕绉颁腑鑾峰彇 + shipperAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); + // 璁剧疆鍦板潃淇℃伅锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鍦板潃鑾峰彇 + shipperAddressBook.setAddressInfo(logisticsOrder.getShipperAddress()); + // 璁剧疆鍦板潃绫诲瀷锛1琛ㄧず鍙戣揣浜哄湴鍧 + shipperAddressBook.setAddressType(1); + // 璁剧疆鍏徃ID锛屼粠鐗╂祦璁㈠崟涓幏鍙 + shipperAddressBook.setCompanyId(logisticsOrder.getCompanyId()); + // 璁剧疆鍏徃鍚嶇О锛屼粠鐗╂祦璁㈠崟涓幏鍙 + shipperAddressBook.setCompanyName(logisticsOrder.getCompanyName()); + // 璁剧疆鍒涘缓浜猴紝浠庣墿娴佽鍗曚腑鑾峰彇 + shipperAddressBook.setCreateBy(logisticsOrder.getCreateBy()); + // 璁剧疆鑱旂郴鐢佃瘽锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鎵嬫満淇℃伅涓幏鍙 + shipperAddressBook.setMobile(logisticsOrder.getShipperMobile()); + list.add(shipperAddressBook); + // 鍥炲～鏂板鐨勫彂璐т汉id + logisticsOrder.setShipperId(shipperAddressBook.getId()); + } else { // 鏈塱d,鏌ヨ锛屽苟鏇存柊鍚嶇О final LogisticsAddressBook oldLogisticsAddressBook = logisticsAddressBookMapper.selectById(logisticsOrder.getShipperId()); oldLogisticsAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); + // 鍦板潃 + oldLogisticsAddressBook.setAddressInfo(logisticsOrder.getShipperAddress()); + // 鐢佃瘽 + oldLogisticsAddressBook.setMobile(logisticsOrder.getShipperMobile()); list.add(oldLogisticsAddressBook); } - if(StringUtils.isEmpty(logisticsOrder.getReceiverId())){ - final LambdaQueryWrapper stuQuery2 = new LambdaQueryWrapper<>(); - stuQuery2.eq(LogisticsAddressBook::getShipperOrReceiverName, logisticsOrder.getReceiverName()) - .eq(LogisticsAddressBook::getAddressType, 2) - .eq(LogisticsAddressBook::getMobile, logisticsOrder.getReceiverMobile()) - .eq(LogisticsAddressBook::getAddressInfo, logisticsOrder.getReceiverAddress()); - final Long count2 = getBaseMapper().selectCount(stuQuery2); - - if(count2 == 0 && StringUtils.isEmpty(logisticsOrder.getReceiverId())) { - // 鍒涘缓鏀惰揣浜哄湴鍧绨 - final LogisticsAddressBook reciverAddressBook = new LogisticsAddressBook(); - // 璁剧疆鏀惰揣浜哄悕绉帮紝浠庣墿娴佽鍗曠殑鏀惰揣浜哄悕绉颁腑鑾峰彇 - reciverAddressBook.setShipperOrReceiverName(logisticsOrder.getReceiverName()); - // 璁剧疆鍦板潃淇℃伅锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鍦板潃鑾峰彇 - reciverAddressBook.setAddressInfo(logisticsOrder.getReceiverAddress()); - // 璁剧疆鍦板潃绫诲瀷锛1琛ㄧず鍙戣揣浜哄湴鍧 - reciverAddressBook.setAddressType(2); - // 璁剧疆鍏徃ID锛屼粠鐗╂祦璁㈠崟涓幏鍙 - reciverAddressBook.setCompanyId(logisticsOrder.getCompanyId()); - // 璁剧疆鍏徃鍚嶇О锛屼粠鐗╂祦璁㈠崟涓幏鍙 - reciverAddressBook.setCompanyName(logisticsOrder.getCompanyName()); - // 璁剧疆鍒涘缓浜猴紝浠庣墿娴佽鍗曚腑鑾峰彇 - reciverAddressBook.setCreateBy(logisticsOrder.getCreateBy()); - // 璁剧疆鑱旂郴鐢佃瘽锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鎵嬫満淇℃伅涓幏鍙 - reciverAddressBook.setMobile(logisticsOrder.getReceiverMobile()); - list.add(reciverAddressBook); - } - }else{ + if (StringUtils.isEmpty(logisticsOrder.getReceiverId())) { + // 鍒涘缓鏀惰揣浜哄湴鍧绨 + final LogisticsAddressBook reciverAddressBook = new LogisticsAddressBook(); + // 璁剧疆鏀惰揣浜哄悕绉帮紝浠庣墿娴佽鍗曠殑鏀惰揣浜哄悕绉颁腑鑾峰彇 + reciverAddressBook.setShipperOrReceiverName(logisticsOrder.getReceiverName()); + // 璁剧疆鍦板潃淇℃伅锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鍦板潃鑾峰彇 + reciverAddressBook.setAddressInfo(logisticsOrder.getReceiverAddress()); + // 璁剧疆鍦板潃绫诲瀷锛1琛ㄧず鍙戣揣浜哄湴鍧 + reciverAddressBook.setAddressType(2); + // 璁剧疆鍏徃ID锛屼粠鐗╂祦璁㈠崟涓幏鍙 + reciverAddressBook.setCompanyId(logisticsOrder.getCompanyId()); + // 璁剧疆鍏徃鍚嶇О锛屼粠鐗╂祦璁㈠崟涓幏鍙 + reciverAddressBook.setCompanyName(logisticsOrder.getCompanyName()); + // 璁剧疆鍒涘缓浜猴紝浠庣墿娴佽鍗曚腑鑾峰彇 + reciverAddressBook.setCreateBy(logisticsOrder.getCreateBy()); + // 璁剧疆鑱旂郴鐢佃瘽锛屼粠鐗╂祦璁㈠崟鐨勫彂璐т汉鎵嬫満淇℃伅涓幏鍙 + reciverAddressBook.setMobile(logisticsOrder.getReceiverMobile()); + list.add(reciverAddressBook); + + // 鍥炲～鏂板鐨勬敹璐т汉id + logisticsOrder.setReceiverId(reciverAddressBook.getId()); + } else { // 鏈塱d,鏌ヨ锛屽苟鏇存柊鍚嶇О final LogisticsAddressBook oldLogisticsAddressBook = logisticsAddressBookMapper.selectById(logisticsOrder.getReceiverId()); - oldLogisticsAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); + // 鍚嶇О + oldLogisticsAddressBook.setShipperOrReceiverName(logisticsOrder.getReceiverName()); + // 鍦板潃 + oldLogisticsAddressBook.setAddressInfo(logisticsOrder.getReceiverAddress()); + // 鐢佃瘽 + oldLogisticsAddressBook.setMobile(logisticsOrder.getReceiverMobile()); list.add(oldLogisticsAddressBook); } // 璋冪敤save鏂规硶淇濆瓨鍦板潃绨夸俊鎭紝杩斿洖淇濆瓨缁撴灉 final Gson gson = new Gson(); System.out.println(gson.toJson(list)); - if(list.isEmpty()){ + if (list.isEmpty()) { return true; } return saveOrUpdateBatch(list); @@ -129,42 +122,46 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl getLogisticsAddressBookPageList(LogisticsAddressBookQueryVo logisticsAddressBookQueryVo) { final Page page = new Page<>(); final LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(logisticsAddressBookQueryVo != null && StringUtils.isNotEmpty(logisticsAddressBookQueryVo.getKeyWord())){ + if (logisticsAddressBookQueryVo != null && StringUtils.isNotEmpty(logisticsAddressBookQueryVo.getKeyWord())) { wrapper.like(LogisticsAddressBook::getShipperOrReceiverName, logisticsAddressBookQueryVo.getKeyWord()).or() .like(LogisticsAddressBook::getMobile, logisticsAddressBookQueryVo.getKeyWord()); } - if(logisticsAddressBookQueryVo != null && logisticsAddressBookQueryVo.getAddressType() !=null ){ + if (logisticsAddressBookQueryVo != null && logisticsAddressBookQueryVo.getAddressType() != null) { wrapper.eq(LogisticsAddressBook::getAddressType, logisticsAddressBookQueryVo.getAddressType()); } + if (logisticsAddressBookQueryVo != null && logisticsAddressBookQueryVo.getCompanyId() != null) { + wrapper.eq(LogisticsAddressBook::getCompanyId, logisticsAddressBookQueryVo.getCompanyId()); + } page.setCurrent(logisticsAddressBookQueryVo.getPageNum()); page.setSize(logisticsAddressBookQueryVo.getPageSize()); - return logisticsAddressBookMapper.selectPage(page,wrapper); + return logisticsAddressBookMapper.selectPage(page, wrapper); } /** * 鏍规嵁鍚嶇О锛堟敮鎸佹嫾闊虫ā绯婂尮閰嶏級鍙婃墜鏈哄彿鏌ヨ鍒楄〃 - * @author 鐜嬪瘜搴 - * @date 2024/10/8 + * * @param logisticsAddressBookQueryVo * @return List + * @author 鐜嬪瘜搴 + * @date 2024/10/8 */ @Override public JSONObject getLogisticsAddressBookList(LogisticsAddressBookQueryVo logisticsAddressBookQueryVo) { final JSONObject jsonObject = new JSONObject(); // 蹇呴』鍖呭惈addressType锛 - if(logisticsAddressBookQueryVo.getAddressType() == null){ - jsonObject.set("flag","0"); - jsonObject.set("msg","addressType鍙傛暟涓虹┖"); + if (logisticsAddressBookQueryVo.getAddressType() == null) { + jsonObject.set("flag", "0"); + jsonObject.set("msg", "addressType鍙傛暟涓虹┖"); return jsonObject; } - if(StringUtils.isEmpty(logisticsAddressBookQueryVo.getShipperOrReceiverName()) && StringUtils.isEmpty(logisticsAddressBookQueryVo.getMobile())){ - jsonObject.set("flag","0"); - jsonObject.set("msg","濮撳悕鍙婄數璇濆繀椤讳紶涓涓紒"); + if (StringUtils.isEmpty(logisticsAddressBookQueryVo.getShipperOrReceiverName()) && StringUtils.isEmpty(logisticsAddressBookQueryVo.getMobile())) { + jsonObject.set("flag", "0"); + jsonObject.set("msg", "濮撳悕鍙婄數璇濆繀椤讳紶涓涓紒"); return jsonObject; } final List logisticsAddressBookList = logisticsAddressBookMapper.getLogisticsAddressBookList(logisticsAddressBookQueryVo); - jsonObject.set("data",logisticsAddressBookList); - jsonObject.set("flag","1"); + jsonObject.set("data", logisticsAddressBookList); + jsonObject.set("flag", "1"); return jsonObject; } @@ -179,8 +176,8 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl logisticsAddressBook = logisticsAddressBookService.getByOrder(logisticsOrder); - if (logisticsAddressBook.containsKey("shipperLogisticsAddressBook")) { - logisticsOrder.setShipperId(logisticsAddressBook.get("shipperLogisticsAddressBook").getId()); - } - - if (logisticsAddressBook.containsKey("receiverLogisticsAddressBook")) { - logisticsOrder.setReceiverId(logisticsAddressBook.get("receiverLogisticsAddressBook").getId()); - } logisticsOrderService.saveOrUpdate(logisticsOrder); return ResultUtil.data(logisticsOrder); } else { @@ -105,23 +94,16 @@ public class LogisticsOrderController { final LogisticsOrder oldLogisticsOrder = logisticsOrderService.getById(logisticsOrder.getId()); // 璁剧疆鍒涘缓浜哄鍚 final LogiticsCompany logiticsCompany = securityUtil.getCurrCompany(); - logisticsOrder.setUpdateBy(logiticsCompany.getId()); - // 鏍规嵁鏀跺彂璐т汉鑾峰彇淇℃伅锛屽鏋滃悕瀛楀彉浜嗭紝閭ｄ箞淇敼鏀跺彂璐т汉鐨勪俊鎭 - // 璁剧疆鍒涘缓浜哄鍚 - logisticsOrder.setCreateBy(logiticsCompany.getId()); - logisticsOrder.setCreateByName(logiticsCompany.getContacts()); + if(logiticsCompany != null){ + logisticsOrder.setUpdateBy(logiticsCompany.getId()); + // 鏍规嵁鏀跺彂璐т汉鑾峰彇淇℃伅锛屽鏋滃悕瀛楀彉浜嗭紝閭ｄ箞淇敼鏀跺彂璐т汉鐨勪俊鎭 + // 璁剧疆鍒涘缓浜哄鍚 + logisticsOrder.setCreateBy(logiticsCompany.getId()); + logisticsOrder.setCreateByName(logiticsCompany.getContacts()); + } // 20241015 淇濆瓨鏀跺彂璐т汉鍦板潃绨匡紝鍏堜繚瀛樺湴鍧绨匡紝鏂逛究鍚庤竟鑾峰彇鏀跺彂璐т汉id final boolean b = logisticsAddressBookService.saveLogisticsAddressBook(logisticsOrder); if (b) { - // 鑾峰彇鏀惰揣浜篿d - final Map logisticsAddressBook = logisticsAddressBookService.getByOrder(logisticsOrder); - if (logisticsAddressBook.containsKey("shipperLogisticsAddressBook")) { - logisticsOrder.setShipperId(logisticsAddressBook.get("shipperLogisticsAddressBook").getId()); - } - - if (logisticsAddressBook.containsKey("receiverLogisticsAddressBook")) { - logisticsOrder.setReceiverId(logisticsAddressBook.get("receiverLogisticsAddressBook").getId()); - } final boolean a = logisticsOrderService.saveOrUpdate(logisticsOrder); if (a) { //濡傛灉鏇存柊鎴愬姛锛屾妸淇敼璁板綍淇濆瓨涓涓 @@ -243,7 +225,7 @@ public class LogisticsOrderController { } try { logisticsOrderService.batchUpdateOrderStatus(orderIds, status); - return ResultUtil.error("鎵归噺鏇存柊璁㈠崟鐘舵佹垚鍔燂紒"); + return ResultUtil.success("鎵归噺鏇存柊璁㈠崟鐘舵佹垚鍔燂紒"); } catch (Exception e) { return ResultUtil.error("鎵归噺鏇存柊璁㈠崟鐘舵佸け璐ワ紒"); } diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java index a94d39d7..a596d878 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/entity/LogisticsOrder.java @@ -203,6 +203,10 @@ public class LogisticsOrder{ @ApiModelProperty(value = "璁㈠崟鐘舵") private String orderStatus; + @CompareField(name = "閲嶉噺鍘嗗彶") + @ApiModelProperty(value = "閲嶉噺鍘嗗彶") + private String weightHistory; + @Transient @TableField(exist = false) @ApiModelProperty(value = "淇敼璁板綍鏁") diff --git a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/StatisticsVo.java b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/StatisticsVo.java index 6d5ceb5d..c18b6db1 100644 --- a/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/StatisticsVo.java +++ b/hiver-core/src/main/java/cc/hiver/core/logisticsorder/vo/StatisticsVo.java @@ -40,4 +40,8 @@ public class StatisticsVo { // 淇濊垂 @ApiModelProperty(value = "淇濊垂") private BigDecimal totalInsuranceFee; + + // 鎬婚噸閲 + @ApiModelProperty(value = "鎬婚噸閲") + private BigDecimal totalWeight; } diff --git a/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml index 4c7df104..e07d6622 100644 --- a/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml +++ b/hiver-core/src/main/resources/mapper/LogisticsOrderMapper.xml @@ -43,6 +43,7 @@ + @@ -51,7 +52,7 @@ 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,order_status, - shipper_id,receiver_id + shipper_id,receiver_id,weight_history