diff --git a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml index 8330b86..bf7e866 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardMapper.xml +++ b/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 - left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid + emp_card gi + 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} diff --git a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java index ec2da8d..31e309d 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java +++ b/src/main/java/com/yxt/yythmall/biz/empcard/EmpCardService.java @@ -139,7 +139,7 @@ public class EmpCardService extends MybatisBaseService { return rb.setMsg("该卡已绑定"); } lpkGiftCard.setCustomerSid(bindCardDto.getCustomerSid()); - lpkGiftCard.setState("2"); + lpkGiftCard.setState("3"); lpkGiftCard.setBindDate(new Date()); baseMapper.updateById(lpkGiftCard); List k = baseMapper.getGoodsList(lpkGiftCard.getSid()); diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml index cd37024..6dfe2fc 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftMapper.xml +++ b/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 - left join lpk_giftbag_goods d on d.giftbagSid=gi.giftbagSid - left join lpk_goods e on e.sid =d.goodsSid + emp_card_gift gi + left join emp_card_gift_goods d on d.empCardGiftSid=gi.sid + left join lpk_goods e on e.sid =d.goodsSid where gi.sid=#{sid} \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java index 14c9b70..71dbe22 100644 --- a/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java +++ b/src/main/java/com/yxt/yythmall/biz/empcardgift/EmpCardGiftService.java @@ -120,7 +120,7 @@ public class EmpCardGiftService extends MybatisBaseService