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

Merge remote-tracking branch 'origin/test' into test

Browse Source 
# Conflicts:
#	cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
This commit is contained in:
张松
2025-09-26 09:46:31 +08:00
parent d34c422425 56ed87e3b5
commit 8d4a8aac15
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberLevelDTO.java
View File

@@ -6,10 +6,11 @@ import com.czg.validator.group.member.MemberLevelCycleRewardGroup;
import jakarta.validation.constraints.*;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
@Data
public class MemberLevelDTO {
public class MemberLevelDTO implements Serializable {
/**
* ID
*/

42
cash-service/market-service/src/main/resources/mapper/MkShopCouponRecordMapper.xml
View File

@@ -36,24 +36,34 @@
order by record.create_time desc
</select>
<select id="findCouponVOByUser" resultType="com.czg.market.vo.UserCouponVO">
select mk_shop_coupon_record.*,
select
mk_shop_coupon_record.id as id,
mk_shop_coupon_record.name as name,
mk_shop_coupon_record.type as type,
mk_shop_coupon_record.full_amount as fullAmount,
mk_shop_coupon_record.discount_amount as discountAmount,
mk_shop_coupon_record.discount_rate as discountRate,
mk_shop_coupon_record.max_discount_amount as maxDiscountAmount,
mk_shop_coupon_record.create_time as createTime,
mk_shop_coupon_record.use_time as useTime,
mk_shop_coupon_record.use_start_time as effectStartTime,
mk_shop_coupon_record.use_end_time as effectEndTime,
coupon.use_shop_type as useShopType,
coupon.foods as foods,
coupon.use_shops as useShops,
coupon.shop_id as shopId,
coupon.use_type as useType,
coupon.use_days as useDays,
coupon.use_time_type as useTimeType,
coupon.use_start_time as useStartTime,
coupon.use_end_time as useEndTime,
coupon.get_limit as getLimit,
coupon.use_limit as useLimit,
coupon.discount_share as discountShare,
coupon.vip_price_share as vipPriceShare,
coupon.rule_details as ruleDetails,
coupon.discount_num as discountNum
mk_shop_coupon_record.status as status,
coupon.use_shop_type as useShopType,
coupon.foods as foods,
coupon.use_shops as useShops,
coupon.shop_id as shopId,
coupon.use_type as useType,
coupon.use_days as useDays,
coupon.use_time_type as useTimeType,
coupon.use_start_time as useStartTime,
coupon.use_end_time as useEndTime,
coupon.get_limit as getLimit,
coupon.use_limit as useLimit,
coupon.discount_share as discountShare,
coupon.vip_price_share as vipPriceShare,
coupon.rule_details as ruleDetails,
coupon.discount_num as discountNum
from mk_shop_coupon_record
left join mk_shop_coupon coupon on mk_shop_coupon_record.coupon_id = coupon.id
where mk_shop_coupon_record.shop_user_id in

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

@@ -943,6 +943,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
log.error("订单积分使用或优惠券扣除失败，订单id：{}", orderInfo.getId());
}
} else {
//新客立减
if (orderInfo.getNewCustomerDiscountAmount() != null) {
newConsumerDiscountRecordService.useDiscount(shopUser.getId(), orderInfo.getId(), orderInfo.getNewCustomerDiscountAmount());
}
//积分使用
if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
pointsService.deductPoints(shopUser.getId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo);
@@ -1139,7 +1143,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
} else {
//新客立减
if (param.getNewCustomerDiscountId() != null) {
newConsumerDiscountRecordService.useDiscount(shopUser.getId(), param.getOrderId(), param.getNewCustomerDiscountAmount());
newConsumerDiscountRecordService.checkDiscount(param.getNewCustomerDiscountId(), shopUser.getId(), param.getOrderId(), param.getNewCustomerDiscountAmount());
}
//积分使用
if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {