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

src/main/java/com/sqx/modules/printInfo/controller/PrintInfoController.java

@@ -214,6 +214,30 @@ public class PrintInfoController {
         if (shopId == null) {
             return Result.error("商铺ID不能为空");
         }
+
+        //region 必填
+        List<String> haves = new ArrayList<>();
+        haves.add("platform_name");
+        haves.add("shop_name");
+        haves.add("order_number");
+        haves.add("order_type_extra");
+        haves.add("expect_delivery_time");
+        haves.add("goods_name");
+        haves.add("goods_price");
+        haves.add("goods_num");
+        haves.add("remark");
+        haves.add("pack_money");
+        haves.add("goods_money");
+        haves.add("coupon_money");
+        haves.add("errand_money");
+        haves.add("activity_title");
+        haves.add("pay_money");
+        haves.add("user_name");
+        haves.add("phone");
+        haves.add("address_detail");
+        haves.add("pay_time");
+        //endregion
+
         PrintResultModelVo resultData = new PrintResultModelVo();
         resultData.setShopId(shopId);
         List<PrintModelResult> result = new ArrayList<>();
@@ -231,7 +255,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     details.add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
@@ -264,7 +292,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     details.add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
@@ -292,7 +324,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     data.getDetails().add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
@@ -317,7 +353,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     details.add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
@@ -344,7 +384,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     data.getDetails().add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
@@ -369,7 +413,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     details.add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
@@ -396,7 +444,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     data.getDetails().add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
@@ -420,7 +472,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     details.add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();
@@ -447,7 +503,11 @@ public class PrintInfoController {
                     detailData.setId(nowInfo.getId());
                     detailData.setPrintField(nowInfo.getPrintField());
                     detailData.setPrintName(nowInfo.getPrintName());
-                    detailData.setIsCheck(0);
+                    if(haves.contains(nowInfo.getPrintField())){
+                        detailData.setIsCheck(1);
+                    }else{
+                        detailData.setIsCheck(0);
+                    }
                     data.getDetails().add(detailData);
 
                     PrintModelTypeResult typeData = new PrintModelTypeResult();

src/main/java/com/sqx/modules/printInfo/service/impl/PrintInfoServiceImpl.java

@@ -77,7 +77,7 @@ public class PrintInfoServiceImpl extends ServiceImpl<PrintInfoDao, PrintInfo> i
     @Override
     public int existInfo(Integer type,String field) {
         QueryWrapper<PrintInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type",type);
+        queryWrapper.eq("type_id",type);
         queryWrapper.eq("print_field",field);
         queryWrapper.eq("delete_flag",0);
         int result = baseMapper.selectCount(queryWrapper);
@@ -87,7 +87,7 @@ public class PrintInfoServiceImpl extends ServiceImpl<PrintInfoDao, PrintInfo> i
     @Override
     public PrintInfo existInfoData(Integer type, String field) {
         QueryWrapper<PrintInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type",type);
+        queryWrapper.eq("type_id",type);
         queryWrapper.eq("print_field",field);
         queryWrapper.eq("delete_flag",0);
         PrintInfo result = baseMapper.selectOne(queryWrapper);

src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -37,6 +37,7 @@ import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -662,7 +663,7 @@ public class FeiYunUtils {
                             baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
                             break;
                         case "expect_delivery_time":
-                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
                             break;
                         case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
                             baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
@@ -849,7 +850,7 @@ public class FeiYunUtils {
                             goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
                             break;
                         case "expect_delivery_time":
-                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
                             break;
                         case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
                             goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
@@ -1054,7 +1055,7 @@ public class FeiYunUtils {
                             payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
                             break;
                         case "expect_delivery_time":
-                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
                             break;
                         default:
                             break;
@@ -1212,7 +1213,7 @@ public class FeiYunUtils {
                             userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
                             break;
                         case "expect_delivery_time":
-                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
                             break;
                         case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
                             userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");