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

超级会员相关

Browse Source
This commit is contained in:
张松
2025-09-11 17:27:57 +08:00
parent f7da6eac1e
commit 5776984a42
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MemberConfigDTO.java
View File

@@ -93,5 +93,7 @@ public class MemberConfigDTO {
@NotBlank(message = "规则说明不能为空")
private String remark;
private String openType;
}

3
cash-common/cash-common-service/src/main/java/com/czg/market/entity/TbMemberConfig.java
View File

@@ -8,7 +8,6 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.io.Serial;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -94,4 +93,6 @@ public class TbMemberConfig implements Serializable {
@Column(onInsertValue = "now()", onUpdateValue = "now()")
private LocalDateTime updateTime;
private String openType;
}

2
cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberConfigVO.java
View File

@@ -80,4 +80,6 @@ public class MemberConfigVO {
* 修改时间
*/
private LocalDateTime updateTime;
private String openType;
}

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
View File

@@ -104,7 +104,6 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
}
});
memberConfig.setConfigList(JSONObject.toJSONString(memberDTO.getConfigList()));
memberConfig.setConditionList(null);
}
if (memberConfig.getConfigList() != null && !memberConfig.getConfigList().isEmpty() &&
@@ -124,7 +123,6 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
// });
memberConfig.setConditionList(JSONObject.toJSONString(memberDTO.getConditionList()));
memberConfig.setConfigList(null);
}
if (memberDTO.getMemberPriceShopIdList() != null && !memberDTO.getMemberPriceShopIdList().isEmpty()) {

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

@@ -21,16 +21,14 @@ import com.czg.enums.ShopUserFlowBizEnum;
import com.czg.exception.ApiNotPrintException;
import com.czg.exception.CzgException;
import com.czg.exception.OrderCancelException;
import com.czg.market.service.TbMemberConfigService;
import com.czg.order.dto.*;
import com.czg.order.entity.CashierCart;
import com.czg.order.entity.OrderDetail;
import com.czg.order.entity.OrderInfo;
import com.czg.order.entity.OrderPayment;
import com.czg.order.enums.PayEnums;
import com.czg.order.service.CashierCartService;
import com.czg.order.service.OrderDetailService;
import com.czg.order.service.OrderInfoService;
import com.czg.order.service.OrderPaymentService;
import com.czg.order.service.*;
import com.czg.order.vo.*;
import com.czg.product.entity.Product;
import com.czg.product.service.ProductRpcService;
@@ -115,6 +113,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
// private ShopCouponService couponService;
@DubboReference
private ShopActivateCouponRecordService couponRecordService;
@DubboReference
private TbMemberConfigService memberConfigService;
@Resource
private MemberOrderService memberOrderService;
// 延迟 5 秒
private static final long DELAY = 5;
//重试次数
@@ -698,6 +700,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
}
}
}else if ("memberPay".equals(payment.getPayType())) {
// memberConfigService.joinMember()
}
}
}