This commit is contained in:
2024-01-21 14:08:00 +08:00
parent 6e49464145
commit 4921547c04
5 changed files with 11 additions and 11 deletions

View File

@@ -237,10 +237,10 @@
e.name as goodsName, e.name as goodsName,
d.goodsNumber as goodsNumber, d.goodsNumber as goodsNumber,
e.brandId as e.brandId, e.brandId as e.brandId,
e.cetegoryId as cetegoryId e.cetegoryId as cetegoryId
FROM 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 left join lpk_goods e on e.sid =d.goodsSid
where gi.sid=#{sid} where gi.sid=#{sid}
</select> </select>

View File

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

View File

@@ -245,11 +245,11 @@
e.name as goodsName, e.name as goodsName,
d.goodsNumber as goodsNumber, d.goodsNumber as goodsNumber,
e.brandId as e.brandId, e.brandId as e.brandId,
e.cetegoryId as cetegoryId e.cetegoryId as cetegoryId
FROM 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} where gi.sid=#{sid}
</select> </select>
</mapper> </mapper>

View File

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

View File

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