czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

店铺

Browse Source
This commit is contained in:
wangw
2025-03-01 09:52:35 +08:00
parent ffc620f6d8
commit 0fe3e43163
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserMoneyEditDTO.java
View File

@@ -7,6 +7,7 @@ import jakarta.validation.constraints.NotNull;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
/** /**
@@ -14,7 +15,7 @@ import java.math.BigDecimal;
*/ */
@Data @Data
@Builder @Builder
public class ShopUserMoneyEditDTO implements java.io.Serializable{ public class ShopUserMoneyEditDTO implements Serializable {
/** /**
* 对应shopUserid * 对应shopUserid
*/ */

3
cash-common/cash-common-service/src/main/java/com/czg/order/service/CashierCartService.java
View File

@@ -19,9 +19,10 @@ public interface CashierCartService extends IService<CashierCart> {
/** /**
* 获取到的结果 是针对tb_order_detail的 * 获取到的结果 是针对tb_order_detail的
* *
* @param shopId 桌码
* @param tableCode 桌码 * @param tableCode 桌码
* @param isUseVip 是否使用会员价 * @param isUseVip 是否使用会员价
* @param placeNum 第几次下单 * @param placeNum 第几次下单
*/ */
List<OrderDetail> getCartByTableCode(@NotBlank String tableCode, @NotNull Integer isUseVip,@NotNull Integer placeNum); List<OrderDetail> getCartByTableCode(@NotBlank Long shopId,@NotBlank String tableCode, @NotNull Integer isUseVip,@NotNull Integer placeNum);
} }

2
cash-service/order-service/src/main/java/com/czg/service/order/mapper/CashierCartMapper.java
View File

@@ -21,5 +21,5 @@ public interface CashierCartMapper extends BaseMapper<CashierCart> {
* @param isUseVip 是否使用会员价 * @param isUseVip 是否使用会员价
* @param placeNum 第几次下单 * @param placeNum 第几次下单
*/ */
List<OrderDetail> getCartByTableCode(String tableCode,Integer isUseVip,Integer placeNum); List<OrderDetail> getCartByTableCode(Long shopId,String tableCode,Integer isUseVip,Integer placeNum);
} }

5
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/CashierCartServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.mybatisflex.spring.service.impl.ServiceImpl;
import com.czg.order.entity.CashierCart; import com.czg.order.entity.CashierCart;
import com.czg.order.service.CashierCartService; import com.czg.order.service.CashierCartService;
import com.czg.service.order.mapper.CashierCartMapper; import com.czg.service.order.mapper.CashierCartMapper;
import jakarta.validation.constraints.NotBlank;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
@@ -19,7 +20,7 @@ import java.util.List;
public class CashierCartServiceImpl extends ServiceImpl<CashierCartMapper, CashierCart> implements CashierCartService { public class CashierCartServiceImpl extends ServiceImpl<CashierCartMapper, CashierCart> implements CashierCartService {
@Override @Override
public List<OrderDetail> getCartByTableCode(String tableCode, Integer isUseVip, Integer placeNum) { public List<OrderDetail> getCartByTableCode(Long shopId, String tableCode, Integer isUseVip, Integer placeNum) {
return getMapper().getCartByTableCode(tableCode, isUseVip, placeNum); return getMapper().getCartByTableCode(shopId, tableCode, isUseVip, placeNum);
} }
} }

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -191,7 +191,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} }
} }
//获取商品信息 计算金额 需要传入优惠券 减去优惠券 //获取商品信息 计算金额 需要传入优惠券 减去优惠券
List<OrderDetail> orderDetails = cartService.getCartByTableCode(param.getTableCode(), param.isVipPrice() ? 1 : 0, param.getPlaceNum()); List<OrderDetail> orderDetails = cartService.getCartByTableCode(shopInfo.getId(), param.getTableCode(), param.isVipPrice() ? 1 : 0, param.getPlaceNum());
log.info("下单1 {}", JSONObject.toJSONString(orderDetails)); log.info("下单1 {}", JSONObject.toJSONString(orderDetails));
//总打包费 //总打包费
BigDecimalDTO packAmount = new BigDecimalDTO(BigDecimal.ZERO); BigDecimalDTO packAmount = new BigDecimalDTO(BigDecimal.ZERO);

1
cash-service/order-service/src/main/resources/mapper/CashierCartMapper.xml
View File

@@ -46,5 +46,6 @@
left join tb_product pros on cart.product_id = pros.id left join tb_product pros on cart.product_id = pros.id
left join tb_prod_sku skus on cart.sku_id = skus.id left join tb_prod_sku skus on cart.sku_id = skus.id
where table_code = #{tableCode} where table_code = #{tableCode}
and cart.shop_id = #{shopId}
</select> </select>
</mapper> </mapper>