发货相关更新

src/main/java/com/peanut/modules/book/controller/ExpressController.java

@@ -3,7 +3,9 @@ package com.peanut.modules.book.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.peanut.common.utils.HttpsUtil;
 import com.peanut.common.utils.R;
 import com.peanut.modules.book.entity.ExpressCompany;
 import com.peanut.modules.book.entity.ExpressOrder;
@@ -16,6 +18,7 @@ import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -53,10 +56,10 @@ public class ExpressController {
      * @return
      */
     @RequestMapping("/getExpressPrints")
-    public R getExpressPrints(@RequestBody ExpressPrintDto expressPrintDto){
+    public R getExpressPrints(@RequestBody ExpressPrintDto expressPrintDto) throws IOException {
         LambdaQueryWrapper<ExpressOrder> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(expressPrintDto.getExpressOrderSn()!=null,ExpressOrder::getExpressOrderSn,expressPrintDto.getExpressOrderSn());
-        if(expressPrintDto.getDate()!=null){
+        wrapper.eq(StringUtils.isBlank(expressPrintDto.getExpressOrderSn()),ExpressOrder::getExpressOrderSn,expressPrintDto.getExpressOrderSn());
+        if(expressPrintDto.getDate()!=null&&expressPrintDto.getDate()!=""){
             String startDate = expressPrintDto.getDate()+" 00:00:00";
             String endDate = expressPrintDto.getDate()+" 23:59:59";
             wrapper.between(ExpressOrder::getCreateTime,startDate,endDate);
@@ -64,11 +67,17 @@ public class ExpressController {
         wrapper.eq(expressPrintDto.getType()!=0,ExpressOrder::getTemplatePrinted,expressPrintDto.getType()==1?1:0);
         wrapper.orderByDesc(ExpressOrder::getCreateTime);
         Page<ExpressOrder> expressOrderPage = expressOrderService.getBaseMapper().selectPage(new Page<>(expressPrintDto.getPage(), expressPrintDto.getLimit()), wrapper);
+        for (ExpressOrder e :expressOrderPage.getRecords()){
+            if(e.getPrintTemplate()!=null){
+                String c_string = HttpsUtil.getHttps(e.getPrintTemplate());
+                e.setPrintString(c_string);
+            }
+        }
         return R.ok().put("page",expressOrderPage);
     }
 
     /**
-     * 获取快递面单列表
+     * 获取快递面单列表(废弃)
      *
      * @return R
      */

src/main/java/com/peanut/modules/book/entity/ExpressOrder.java

@@ -81,6 +81,12 @@ public class ExpressOrder {
      */
     @TableField(exist = false)
     private List<ExpressCommodity> Commodity;
+
+    /**
+     * 面单的string
+     */
+    @TableField(exist = false)
+    private String printString;
     /**
      * 快递单号
      */