|
@@ -214,6 +214,30 @@ public class PrintInfoController {
|
|
|
if (shopId == null) {
|
|
if (shopId == null) {
|
|
|
return Result.error("商铺ID不能为空");
|
|
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();
|
|
PrintResultModelVo resultData = new PrintResultModelVo();
|
|
|
resultData.setShopId(shopId);
|
|
resultData.setShopId(shopId);
|
|
|
List<PrintModelResult> result = new ArrayList<>();
|
|
List<PrintModelResult> result = new ArrayList<>();
|
|
@@ -231,7 +255,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
details.add(detailData);
|
|
details.add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
@@ -264,7 +292,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
details.add(detailData);
|
|
details.add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
@@ -292,7 +324,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
data.getDetails().add(detailData);
|
|
data.getDetails().add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
@@ -317,7 +353,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
details.add(detailData);
|
|
details.add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
@@ -344,7 +384,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
data.getDetails().add(detailData);
|
|
data.getDetails().add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
@@ -369,7 +413,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
details.add(detailData);
|
|
details.add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
@@ -396,7 +444,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
data.getDetails().add(detailData);
|
|
data.getDetails().add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
@@ -420,7 +472,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
details.add(detailData);
|
|
details.add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
@@ -447,7 +503,11 @@ public class PrintInfoController {
|
|
|
detailData.setId(nowInfo.getId());
|
|
detailData.setId(nowInfo.getId());
|
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
detailData.setPrintField(nowInfo.getPrintField());
|
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
detailData.setPrintName(nowInfo.getPrintName());
|
|
|
- detailData.setIsCheck(0);
|
|
|
|
|
|
|
+ if(haves.contains(nowInfo.getPrintField())){
|
|
|
|
|
+ detailData.setIsCheck(1);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ detailData.setIsCheck(0);
|
|
|
|
|
+ }
|
|
|
data.getDetails().add(detailData);
|
|
data.getDetails().add(detailData);
|
|
|
|
|
|
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|
|
PrintModelTypeResult typeData = new PrintModelTypeResult();
|