1/25
This commit is contained in:
@@ -144,7 +144,7 @@ public class EmpCardService extends MybatisBaseService<EmpCardMapper, EmpCard> {
|
||||
baseMapper.updateById(lpkGiftCard);
|
||||
List<vegeVo> k = baseMapper.getGoodsList(lpkGiftCard.getSid());
|
||||
VegetableCellarDto dto = new VegetableCellarDto();
|
||||
dto.setCustomerSid(dto.getCustomerSid());
|
||||
dto.setCustomerSid(bindCardDto.getCustomerSid());
|
||||
dto.setVos(k);
|
||||
vegetableCellarService.save1Goods(dto);
|
||||
vegeReplenishService.saveBindRecord(bindCardDto, "1");
|
||||
|
||||
@@ -126,7 +126,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
|
||||
baseMapper.updateById(empCardGift);
|
||||
List<vegeVo> k = baseMapper.getGoodsList(empCardGift.getSid());
|
||||
VegetableCellarDto dto = new VegetableCellarDto();
|
||||
dto.setCustomerSid(dto.getCustomerSid());
|
||||
dto.setCustomerSid(bindCardDto.getCustomerSid());
|
||||
dto.setVos(k);
|
||||
vegetableCellarService.save1Goods(dto);
|
||||
vegeReplenishService.saveBindRecord(bindCardDto,"2");
|
||||
|
||||
@@ -166,7 +166,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
|
||||
;
|
||||
System.out.println(a.substring(0, 2));
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResultBean bindAllCard(BindCardDto bindCardDto) {
|
||||
ResultBean rb = new ResultBean().fail();
|
||||
|
||||
|
||||
@@ -53,6 +53,9 @@ public class TransferRecordsService extends MybatisBaseService<TransferRecordsMa
|
||||
|
||||
public ResultBean submission(TransferRecordsDto dto) {
|
||||
ResultBean rb = new ResultBean().fail();
|
||||
if(StringUtils.isBlank(dto.getCustomerSid())){
|
||||
return rb.setMsg("参数不全");
|
||||
}
|
||||
TransferRecords order = new TransferRecords();
|
||||
BeanUtil.copyProperties(dto, order, "id", "sid");
|
||||
|
||||
|
||||
@@ -38,20 +38,12 @@ import java.util.Map;
|
||||
public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellarReserveOrderMapper, VegeCellarReserveOrder> {
|
||||
@Autowired
|
||||
VegeCellarReserveDetailsService vegeCellarReserveDetailsService;
|
||||
// @Autowired
|
||||
// LpkGiftCardMapper lpkGiftCardMapper;
|
||||
// @Autowired
|
||||
// LpkGiftBagGoodsService lpkGiftBagGoodsService;
|
||||
@Autowired
|
||||
LpkStoreService lpkStoreService;
|
||||
// @Autowired
|
||||
// private FileUploadComponent fileUploadComponent;
|
||||
|
||||
@Autowired
|
||||
private LpkGoodsService lpkGoodsService;
|
||||
|
||||
// @Autowired
|
||||
// private HttpServletResponse response;
|
||||
//
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResultBean submission(VegeCellarReserveOrderDto dto) {
|
||||
ResultBean rb = new ResultBean().fail();
|
||||
@@ -59,6 +51,9 @@ public class VegeCellarReserveOrderService extends MybatisBaseService<VegeCellar
|
||||
if (!b) {
|
||||
return rb.setMsg("周六、周日不能预约提货");
|
||||
}
|
||||
if(StringUtils.isBlank(dto.getCustomerSid())){
|
||||
return rb.setMsg("参数不全");
|
||||
}
|
||||
VegeCellarReserveOrder order = new VegeCellarReserveOrder();
|
||||
LpkStore lpkStore = lpkStoreService.getOne(new QueryWrapper<LpkStore>().eq("sid", dto.getStoreSid()));
|
||||
BeanUtil.copyProperties(dto, order, "id", "sid");
|
||||
|
||||
@@ -56,6 +56,9 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
|
||||
public ResultBean addGoods(String mainSid) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
OrdOrder ordOrder=ordOrderService.getOne(new QueryWrapper<OrdOrder>().eq("mainSid",mainSid));
|
||||
if(ordOrder.getPayStatus()!=2){
|
||||
return rb.setMsg("此订单不可用");
|
||||
}
|
||||
List<OrdOrderDetail> detailList=ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid",ordOrder.getSid()));
|
||||
for(OrdOrderDetail detail:detailList){
|
||||
LpkGoods cl=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",detail.getGoodsSid()));
|
||||
@@ -84,7 +87,6 @@ public class VegetableCellarService extends MybatisBaseService<VegetableCellarMa
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResultBean saveGoods(VegetableCellarDto dto) {
|
||||
ResultBean rb = ResultBean.fireFail();
|
||||
|
||||
List<ShoppingCart> carts=shoppingCartService.list(new QueryWrapper<ShoppingCart>().eq("customerSid",dto.getCustomerSid()).eq("affiliation",dto.getBrandId()));
|
||||
for(ShoppingCart detail:carts){
|
||||
VegetableCellar vegetableCellar=baseMapper.selectOne(new QueryWrapper<VegetableCellar>().eq("customerSid",dto.getCustomerSid())
|
||||
|
||||
Reference in New Issue
Block a user