修改商品规格加入购物车
This commit is contained in:
@@ -57,7 +57,6 @@ public class LoginContoller {
|
|||||||
public Result getStaffDiscount(@RequestHeader("token") String token,
|
public Result getStaffDiscount(@RequestHeader("token") String token,
|
||||||
@RequestHeader("loginName") String loginName,
|
@RequestHeader("loginName") String loginName,
|
||||||
@RequestHeader("clientType") String clientType){
|
@RequestHeader("clientType") String clientType){
|
||||||
|
|
||||||
return loginService.getStaffDiscount(token);
|
return loginService.getStaffDiscount(token);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -162,6 +162,19 @@ public class OrderService {
|
|||||||
}
|
}
|
||||||
TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId);
|
TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId);
|
||||||
if (Objects.nonNull(cart)) {
|
if (Objects.nonNull(cart)) {
|
||||||
|
|
||||||
|
//查询现有规格商品
|
||||||
|
if("edit".equals(type)&&!cart.getSkuId().equals(skuId.toString())){
|
||||||
|
TbCashierCart cashierCart = cashierCartMapper.selectByDetail(masterId, productId, shopId, skuId.toString(), DateUtils.getDay(), uuid);
|
||||||
|
if(Objects.nonNull(cashierCart)){
|
||||||
|
cashierCart.setNumber(cashierCart.getNumber()+number);
|
||||||
|
cashierCart.setTotalNumber(cashierCart.getNumber()+number);
|
||||||
|
cashierCart.setUpdatedAt(System.currentTimeMillis());
|
||||||
|
cashierCartMapper.updateByPrimaryKey(cashierCart);
|
||||||
|
|
||||||
|
cashierCartMapper.deleteByPrimaryKey(cart.getId());
|
||||||
|
}
|
||||||
|
}else {
|
||||||
cart.setSkuId(skuId.toString());
|
cart.setSkuId(skuId.toString());
|
||||||
cart.setNumber(number);
|
cart.setNumber(number);
|
||||||
cart.setIsGift(isGift);
|
cart.setIsGift(isGift);
|
||||||
@@ -180,6 +193,10 @@ public class OrderService {
|
|||||||
cart.setTotalNumber(number);
|
cart.setTotalNumber(number);
|
||||||
cart.setUuid(uuid);
|
cart.setUuid(uuid);
|
||||||
cashierCartMapper.updateByPrimaryKeySelective(cart);
|
cashierCartMapper.updateByPrimaryKeySelective(cart);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
|
List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");
|
||||||
|
|||||||
Reference in New Issue
Block a user