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
This commit is contained in:
wangw
2025-10-31 15:06:12 +08:00
parent ad8c293579 cb1cb88347
commit b64c2fa598
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionAmountFlowServiceImpl.java
View File

@@ -42,7 +42,12 @@ public class MkDistributionAmountFlowServiceImpl extends ServiceImpl<MkDistribut
.ge(MkDistributionAmountFlow::getCreateTime, startTime)
.select(OrderInfo::getOrderNo);
if (StrUtil.isNotBlank(type)) {
String[] split = type.split(",");
if (split.length != 0) {
queryWrapper.in(MkDistributionAmountFlow::getType, split);
}else {
queryWrapper.eq(MkDistributionAmountFlow::getType, type);
}
}
if (StrUtil.isNotBlank(key)) {
queryWrapper.and(and -> {

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

@@ -69,6 +69,8 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
private MkShopCouponRecordService shopCouponRecordService;
@DubboReference
private ShopInfoService shopInfoService;
@DubboReference
private ShopConfigService shopConfigService;
@Override
public MemberConfigVO detail(Long shopId) {
@@ -189,6 +191,11 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
if (memberDTO.getMemberPriceShopIdList() != null && !memberDTO.getMemberPriceShopIdList().isEmpty()) {
memberConfig.setMemberPriceShopIdList(JSONObject.toJSONString(memberDTO.getMemberPriceShopIdList()));
}
shopConfigService.editStatusByShopIdList(memberConfig.getShopId(), memberConfig.getIsOpen().intValue(),false, "is_account_ay",
"ALL".equals(memberConfig.getMemberPriceShopType()) ? "all" : "part",
StrUtil.isNotBlank(memberConfig.getMemberPriceShopIdList()) ? JSONArray.parseArray(memberConfig.getMemberPriceShopIdList()).toList(Long.class) : new ArrayList<>());
return updateById(memberConfig, false);