1/15

src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExport.java

@@ -29,26 +29,29 @@ public class ReserveOrderExport {
     @ExcelProperty(value = "提货门店",index = 2)
     private String store;
     @ColumnWidth(20)
-    @ExcelProperty(value = "礼包名称",index = 3)
+    @ExcelProperty(value = "卡类型",index = 3)
+    private String cardType;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "礼包名称",index = 4)
     private String bagName;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "提货卡序列号",index = 4)
+    @ExcelProperty(value = "提货卡序列号",index = 5)
     private String serialNumber;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "姓名",index = 5)
+    @ExcelProperty(value = "姓名",index = 6)
     private String userName;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "联系方式",index = 6)
+    @ExcelProperty(value = "联系方式",index = 7)
     private String userPhone;
 
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品名称",index = 7)
+    @ExcelProperty(value = "商品名称",index = 8)
     private String goodsName;
     @ColumnWidth(20)
-    @ExcelProperty(value = "商品数量(份)",index = 8)
+    @ExcelProperty(value = "商品数量(份)",index = 9)
     private String goodsNumber;
     @ExcelIgnore
     private String sid;

src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java

@@ -1163,6 +1163,8 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
                 }
             }
         }
+        order.setPayStatus(4);
+        ordOrderService.update(order,new QueryWrapper<OrdOrder>().eq("mainSid",mainSid));
         return rb.success();
     }
     ///

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java

@@ -181,4 +181,10 @@ public class LpkGiftCardRest {
     public ResultBean  cardShareGoodsDetail(@PathVariable("sid") String sid) {
         return lpkGiftCardService.cardShareGoodsDetail(sid);
     }
+//    @ApiOperation("共享家庭卡详情")
+//    @GetMapping("/cardShareDetail/{sid}")
+//    public ResultBean  cardShareDetail(@PathVariable("sid") String sid) {
+//        return lpkGiftCardService.cardShareDetail(sid);
+//    }
+
 }

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml

@@ -431,7 +431,9 @@
         case o.cardType
         when 1 then '家庭菜窖'
         end cardType,
-        t.goodsSid as goodsSid
+        t.goodsSid as goodsSid,
+        t.goodsNumber as goodsNumber,
+        e.name as goodsName
         FROM
         lpk_reserve_order AS o
         LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
@@ -439,14 +441,11 @@
         LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
+        left join lpk_goods e on e.sid= t.goodsSid
         <where>
             1=1
-            <if test="qw.cardType =='' and qw.cardType ==null ">
-                and o.cardType='1'
-            </if>
-            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='1'">
-                and o.cardType=#{qw.cardType}
-            </if>
+            and o.cardType='1'
+
             <if test="qw.store !='' and qw.store!=null">
                 and s.name=#{qw.store}
             </if>
@@ -473,7 +472,9 @@
         case o.cardType
         when 2 then '亲情菜窖'
         end cardType,
-        t.goodsSid as goodsSid
+        t.goodsSid as goodsSid,
+        t.goodsNumber as goodsNumber,
+        e.name as goodsName
         FROM
         lpk_reserve_order AS o
         LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
@@ -481,14 +482,11 @@
         LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
+        left join lpk_goods e on e.sid= t.goodsSid
         <where>
             1=1
-            <if test="qw.cardType =='' and qw.cardType ==null ">
-                and o.cardType='2'
-            </if>
-            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='2'">
-                and o.cardType=#{qw.cardType}
-            </if>
+            and o.cardType='2'
+
             <if test="qw.bankSid !='' and qw.bankSid!=null">
                 and s.bankSid=#{qw.bankSid}
             </if>
@@ -518,7 +516,9 @@
         case o.cardType
         when 3 then '企业菜窖'
         end cardType,
-        t.goodsSid as goodsSid
+        t.goodsSid as goodsSid,
+        t.goodsNumber as goodsNumber,
+        e.name as goodsName
         FROM
         lpk_reserve_order AS o
         LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
@@ -526,14 +526,11 @@
         LEFT JOIN emp_card AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
+        left join lpk_goods e on e.sid= t.goodsSid
         <where>
             1=1
-            <if test="qw.cardType =='' and qw.cardType ==null ">
-                and o.cardType='3'
-            </if>
-            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType=='3'">
-                and o.cardType=#{qw.cardType}
-            </if>
+            and o.cardType='3'
+
             <if test="qw.bankSid !='' and qw.bankSid!=null">
                 and s.bankSid=#{qw.bankSid}
             </if>
@@ -566,7 +563,9 @@
         case o.cardType
         when 1 then '家庭菜窖'
         end cardType,
-        t.goodsSid as goodsSid
+        t.goodsSid as goodsSid,
+        t.goodsNumber as goodsNumber,
+        e.name as goodsName
         FROM
         lpk_reserve_order AS o
         LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
@@ -574,14 +573,11 @@
         LEFT JOIN lpk_giftcard AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
+        left join lpk_goods e on e.sid= t.goodsSid
         <where>
             1=1
-            <if test="qw.cardType =='' and qw.cardType ==null ">
-                and o.cardType='1'
-            </if>
-            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='1'">
-                and o.cardType=#{qw.cardType}
-            </if>
+            and o.cardType='1'
+
             <if test="qw.store !='' and qw.store!=null">
                 and s.name=#{qw.store}
             </if>
@@ -611,7 +607,9 @@
         case o.cardType
         when 2 then '亲情菜窖'
         end cardType,
-        t.goodsSid as goodsSid
+        t.goodsSid as goodsSid,
+        t.goodsNumber as goodsNumber,
+        e.name as goodsName
         FROM
         lpk_reserve_order AS o
         LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
@@ -619,14 +617,11 @@
         LEFT JOIN emp_card_gift AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.sid = b.sid
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
+        left join lpk_goods e on e.sid= t.goodsSid
         <where>
             1=1
-            <if test="qw.cardType =='' and qw.cardType ==null ">
-                and o.cardType='2'
-            </if>
-            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType='2'">
-                and o.cardType=#{qw.cardType}
-            </if>
+            and o.cardType='2'
+
             <if test="qw.bankSid !='' and qw.bankSid!=null">
                 and s.bankSid=#{qw.bankSid}
             </if>
@@ -658,7 +653,9 @@
         case o.cardType
         when 3 then '企业菜窖'
         end cardType,
-        t.goodsSid as goodsSid
+        t.goodsSid as goodsSid,
+        t.goodsNumber as goodsNumber,
+        e.name as goodsName
         FROM
         lpk_reserve_order AS o
         LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
@@ -666,14 +663,11 @@
         LEFT JOIN emp_card AS c ON o.cardSid = c.sid
         LEFT JOIN lpk_giftbag AS b ON c.giftbagSid = b.sid
         LEFT JOIN lpk_bank AS d ON d.sid = s.bankSid
+        left join lpk_goods e on e.sid= t.goodsSid
         <where>
             1=1
-            <if test="qw.cardType =='' and qw.cardType ==null ">
-                and o.cardType='3'
-            </if>
-            <if test="qw.cardType !='' and qw.cardType!=null and qw.cardType=='3'">
-                and o.cardType=#{qw.cardType}
-            </if>
+            and o.cardType='3'
+
             <if test="qw.bankSid !='' and qw.bankSid!=null">
                 and s.bankSid=#{qw.bankSid}
             </if>

src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java

@@ -386,10 +386,10 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
             exportList= baseMapper.exportExcel3( query);
         }
         List<ReserveOrderExport> exportList1 = new ArrayList<>();
-        if (!exportList.isEmpty()) {
-            exportList.forEach(s -> {
-                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
-                s.setGoodsName(lpkGoods.getName());
+//        if (!exportList.isEmpty()) {
+//            exportList.forEach(s -> {
+//                LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
+//                s.setGoodsName(lpkGoods.getName());
 //                if (StringUtils.isNotBlank(s.getUserPhone())) {
 ////                    String phone = s.getUserPhone().substring(0, 3) + "****" + s.getUserPhone().substring(7);
 //                    String phone = s.getUserPhone();
@@ -428,8 +428,8 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
 //                        }
 //                    }
 //                }
-            });
-        }
+//            });
+//        }
         //定义导出的excel名字
         //定义导出的excel名字
         String excelName = "订单明细.xlsx";

src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java

@@ -49,7 +49,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         BeanUtil.copyProperties(dto, order, "id", "sid");
 
         order.setMainSid(rb2.get("mainSid").toString());
-        order.setPayStatus(1);
+        order.setPayStatus(2);
         order.setPayTime(new Date());
         order.setCardNumber(dto.getCardNumber());
         order.setSource(0);