1/21

src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml

@@ -237,10 +237,10 @@
             e.name as goodsName,
             d.goodsNumber as goodsNumber,
             e.brandId as e.brandId,
-                e.cetegoryId as cetegoryId
+            e.cetegoryId as cetegoryId
         FROM
-            emp_card_gift gi
+            emp_card gi
-                left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid
+                left join lpk_giftbag_goods d on d.giftbagSid=gi.giftbagSid
                 left join lpk_goods e on e.sid =d.goodsSid
         where gi.sid=#{sid}
     </select>

src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java

@@ -139,7 +139,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
             return rb.setMsg("该卡已绑定");
         }
         lpkGiftCard.setCustomerSid(bindCardDto.getCustomerSid());
-        lpkGiftCard.setState("2");
+        lpkGiftCard.setState("3");
         lpkGiftCard.setBindDate(new Date());
         baseMapper.updateById(lpkGiftCard);
         List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid());

src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml

@@ -245,11 +245,11 @@
             e.name as goodsName,
             d.goodsNumber as goodsNumber,
             e.brandId as e.brandId,
-            e.cetegoryId as cetegoryId
+                e.cetegoryId as cetegoryId
         FROM
-        emp_card gi
+            emp_card_gift gi
-        left join lpk_giftbag_goods d on d.giftbagSid=gi.giftbagSid
+                left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid
-        left join lpk_goods e on e.sid =d.goodsSid
+                left join lpk_goods e on e.sid =d.goodsSid
         where gi.sid=#{sid}
     </select>
 </mapper>

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

@@ -120,7 +120,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
             return rb.setMsg("该卡已绑定");
         }
         empCardGift.setCustomerSid(bindCardDto.getCustomerSid());
-        empCardGift.setState("2");
+        empCardGift.setState("3");
         empCardGift.setIsShare("3");
         empCardGift.setBindDate(new Date());
         baseMapper.updateById(empCardGift);

src/main/java/com/yxt/yythmall/biz/vegecallerreserveorder/VegeCellarReserveOrderService.java

@@ -85,8 +85,8 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
         order.setStoreName(lpkStore.getName());
         baseMapper.insert(order);
         dto.setOrderSid(order.getSid());
-        vegeCellarReserveDetailsService.submissionDetail(dto);
+        rb =vegeCellarReserveDetailsService.submissionDetail(dto);
-        return rb.success().setData("预约成功");
+        return rb;
     }
     public ResultBean addGoodsOrder(VegeCellarReserveOrderDto dto) {
         ResultBean rb = new ResultBean().fail();