czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改商品规格加入购物车

Browse Source
This commit is contained in:
牛叉闪闪
2024-08-14 09:38:44 +08:00
parent e640226629
commit b5bc0f2e0a
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
View File

@@ -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);
} }

47
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -162,24 +162,41 @@ public class OrderService {
} }
TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId); TbCashierCart cart = cashierCartMapper.selectByPrimaryKey(cartId);
if (Objects.nonNull(cart)) { if (Objects.nonNull(cart)) {
cart.setSkuId(skuId.toString());
cart.setNumber(number); //查询现有规格商品
cart.setIsGift(isGift); if("edit".equals(type)&&!cart.getSkuId().equals(skuId.toString())){
cart.setIsPack(isPack); TbCashierCart cashierCart = cashierCartMapper.selectByDetail(masterId, productId, shopId, skuId.toString(), DateUtils.getDay(), uuid);
if (isPack.equals("false")){ if(Objects.nonNull(cashierCart)){
cart.setPackFee(BigDecimal.ZERO); cashierCart.setNumber(cashierCart.getNumber()+number);
cashierCart.setTotalNumber(cashierCart.getNumber()+number);
cashierCart.setUpdatedAt(System.currentTimeMillis());
cashierCartMapper.updateByPrimaryKey(cashierCart);
cashierCartMapper.deleteByPrimaryKey(cart.getId());
}
}else { }else {
cart.setPackFee(new BigDecimal(number).multiply(product.getPackFee())); cart.setSkuId(skuId.toString());
} cart.setNumber(number);
if (isGift.equals("false")) { cart.setIsGift(isGift);
cart.setTotalAmount(new BigDecimal(number).multiply(skuWithBLOBs.getSalePrice()).add(cart.getPackFee())); cart.setIsPack(isPack);
} else { if (isPack.equals("false")){
cart.setTotalAmount(BigDecimal.ZERO); cart.setPackFee(BigDecimal.ZERO);
}else {
cart.setPackFee(new BigDecimal(number).multiply(product.getPackFee()));
}
if (isGift.equals("false")) {
cart.setTotalAmount(new BigDecimal(number).multiply(skuWithBLOBs.getSalePrice()).add(cart.getPackFee()));
} else {
cart.setTotalAmount(BigDecimal.ZERO);
}
cart.setTotalNumber(number);
cart.setUuid(uuid);
cashierCartMapper.updateByPrimaryKeySelective(cart);
} }
cart.setTotalNumber(number);
cart.setUuid(uuid);
cashierCartMapper.updateByPrimaryKeySelective(cart);
} else { } else {
List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create"); List<TbCashierCart> list = cashierCartMapper.selectALlByMasterId(masterId, "create");