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

1.代客下单后选择会员修改

This commit is contained in:
SongZhang 2024-08-21 10:23:24 +08:00
parent e04c3ee084
commit b7708d82e1
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
View File

@ -45,7 +45,7 @@ public class OrderController {
String userId = jsonObject.getString("accountId");
return orderService.createCart(cartVo.getMasterId(),cartVo.getProductId(),cartVo.getShopId(),
cartVo.getSkuId(),cartVo.getNumber(),userId,clientType,cartVo.getCartId(),cartVo.getIsGift(),
cartVo.getIsPack(),cartVo.getUuid(),cartVo.getType(), cartVo.getVipUserId(), cartVo.getTableId());
cartVo.getIsPack(),cartVo.getUuid(),cartVo.getType(), cartVo.getTableId());
}
@MyLog(value = "查询购物车信息", tag = LogTag.CART)

11
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java Normal file
View File

@ -0,0 +1,11 @@
package com.chaozhanggui.system.cashierservice.entity.vo;
import com.chaozhanggui.system.cashierservice.entity.TbShopTable;
import lombok.Data;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = true)
@Data
public class TbShopTableVO extends TbShopTable {
private Integer userId;
}

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

@ -108,7 +108,7 @@ public class OrderService {
@Transactional(rollbackFor = Exception.class)
public Result createCart(String masterId, String productId, String shopId, Integer skuId, Integer number,
String userId, String clientType, Integer cartId, String isGift, String isPack, String uuid, String type, Integer vipUserId, String tableId) {
String userId, String clientType, Integer cartId, String isGift, String isPack, String uuid, String type, String tableId) {
if (Objects.isNull(number) || number < 0) {
return Result.fail(CodeEnum.NUMBER);
}
@ -209,7 +209,6 @@ public class OrderService {
cashierCart.setNumber(cashierCart.getNumber()+number);
cashierCart.setTotalNumber(cashierCart.getNumber()+number);
cashierCart.setUpdatedAt(System.currentTimeMillis());
cashierCart.setUserId(vipUserId);
cashierCartMapper.updateByPrimaryKey(cashierCart);
cashierCartMapper.deleteByPrimaryKey(cart.getId());
@ -221,7 +220,6 @@ public class OrderService {
cart.setNumber(number);
cart.setIsGift(isGift);
cart.setIsPack(isPack);
cart.setUserId(vipUserId);
if (isPack.equals("false")){
cart.setPackFee(BigDecimal.ZERO);
@ -259,7 +257,6 @@ public class OrderService {
cashierCart.setStatus("create");
cashierCart.setIsPack(isPack);
cashierCart.setIsGift(isGift);
cashierCart.setUserId(vipUserId);
if (isGift.equals("false")) {
cashierCart.setTotalAmount(new BigDecimal(number).multiply(skuWithBLOBs.getSalePrice()));
} else {
@ -281,7 +278,6 @@ public class OrderService {
cashierCartMapper.insert(cashierCart);
cart=cashierCart;
} else {
cashierCart.setUserId(vipUserId);
if (type.equals("add")) {
cashierCart.setNumber(cashierCart.getNumber() + number);
@ -293,7 +289,6 @@ public class OrderService {
}else {
cashierCart.setPackFee(new BigDecimal(number).multiply(product.getPackFee()));
}
cashierCart.setUserId(vipUserId);
cashierCart.setTotalAmount(new BigDecimal(cashierCart.getNumber()).multiply(skuWithBLOBs.getSalePrice()).add(cashierCart.getPackFee()));
mpCashierCartMapper.updateById(cashierCart);
}
@ -984,12 +979,14 @@ public class OrderService {
queryWrapper.eq(TbCashierCart::getMasterId, cartVo.getMasterId());
queryWrapper.isNull(TbCashierCart::getTableId);
// 台桌点单
}else if (StrUtil.isNotBlank(cartVo.getTableId()) && cartVo.getVipUserId() == null) {
}else if (StrUtil.isNotBlank(cartVo.getTableId()) ) {
queryWrapper.eq(TbCashierCart::getTableId, cartVo.getTableId())
.eq(TbCashierCart::getMasterId, cartVo.getMasterId());
.and(query -> {
query.eq(TbCashierCart::getMasterId, cartVo.getMasterId())
.or()
.isNull(TbCashierCart::getMasterId);
});
// 会员点单
}else {
queryWrapper.eq(TbCashierCart::getUserId, cartVo.getVipUserId());
}
List<TbCashierCart> list = mpCashierCartMapper.selectList(queryWrapper);

2
src/main/resources/mapper/TbShopTableMapper.xml
View File

@ -240,7 +240,7 @@
<if test="status != null and status !=''">
and a.status = #{status}
</if>
GROUP BY a.id
order by a.`sort` asc
</select>
</mapper>