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

Merge branch 'test' into prod

Browse Source
This commit is contained in:
张松
2025-11-05 10:36:53 +08:00
parent f617343a01 90f4b0479d
commit 2d60b5823e
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopConfigServiceImpl.java
View File

@@ -18,6 +18,7 @@ import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
@@ -48,36 +49,40 @@ public class ShopConfigServiceImpl extends ServiceImpl<ShopConfigMapper, ShopCon
@Override
public void editStatusByShopIdList(Long mainShopId, Integer isEnable, boolean onyUpValid, String property, String useShopType, List<Long> shopIdList) {
ShopConfig shopConfig = getOne(new QueryWrapper().eq(ShopConfig::getId, mainShopId));
ShopConfig shopConfig = getById(mainShopId);
if (shopConfig == null) {
shopConfig = new ShopConfig();
shopConfig.setId(mainShopId);
save(shopConfig);
}
List<Long> extistList = list(new QueryWrapper().in(ShopConfig::getId, shopIdList).select(ShopConfig::getId)).stream().map(ShopConfig::getId).toList();
// 防止报错
shopIdList.add(-9999L);
List<Long> extistList;
if (!shopIdList.isEmpty()) {
extistList = list(new QueryWrapper().in(ShopConfig::getId, shopIdList).select(ShopConfig::getId)).stream().map(ShopConfig::getId).toList();
shopIdList.stream().filter(id -> !extistList.contains(id)).forEach(id -> {
save(new ShopConfig().setId(id).setMainId(mainShopId));
save(new ShopConfig().setId(id).setMainId(mainShopId).setIsEnableDiscount(0).setIsProductSuggest(0));
});
} else {
extistList = new ArrayList<>();
}
if (isEnable == 0 && !onyUpValid) {
updateChain().or(or -> {
or.eq(ShopConfig::getMainId, mainShopId);
or.eq(ShopConfig::getId, mainShopId);
}).or(or -> {
or.in(ShopConfig::getId, shopIdList);
}).set(property, 0).update();
}else {
if ("all".equals(useShopType)) {
updateChain().or(or -> {
or.eq(ShopConfig::getMainId, mainShopId);
or.eq(ShopConfig::getId, mainShopId);
}).or(or -> {
or.in(ShopConfig::getId, shopIdList);
}).set(property, 1).update();
}else {
if (shopIdList.isEmpty()) {
updateChain().eq(ShopConfig::getMainId, mainShopId).set(property, 1).update();
updateChain().eq(ShopConfig::getId, mainShopId).set(property, 1).update();
}else {
if (!onyUpValid) {
updateChain().notIn(ShopConfig::getId, shopIdList).set(property, 0).update();

9
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/AppWxServiceImpl.java
View File

@@ -31,15 +31,20 @@ public class AppWxServiceImpl extends BaseWx {
public void init() {
// 小程序id
config.appId = paramsService.getSysParamValue("wx_mini_app_id");
log.info("小程序id:{}", config.appId);
// 小程序secrete
config.appSecret = paramsService.getSysParamValue("wx_mini_secrete");
log.info("小程序secrete:{}", config.appSecret);
config.certPath = "";
// 微信支付公钥
config.pubKey = paramsService.getSysParamValue("wx_pub_key");
log.info("微信支付公钥:{}", config.pubKey);
// api支付证书私钥
config.apiCertKey = paramsService.getSysParamValue("wx_apiclient_key");
log.info("api支付证书私钥:{}", config.apiCertKey);
// api支付证书公钥
config.apiCert = paramsService.getSysParamValue("wx_apiclient_cert");
log.info("api支付证书公钥:{}", config.apiCert);
try {
config.privateKey = RsaKit.loadPrivateKey(config.apiCertKey);
} catch (Exception e) {
@@ -51,13 +56,17 @@ public class AppWxServiceImpl extends BaseWx {
config.platformCertNo = "";
// 商户号
config.mchId = paramsService.getSysParamValue("wx_mch_id");
log.info("商户号:{}", config.mchId);
// v3密钥
config.apiV3Key = paramsService.getSysParamValue("wx_v3_key");
log.info("v3密钥:{}", config.apiV3Key);
config.apiV2Key = "";
// 回调地址
config.notifyUrl = paramsService.getSysParamValue("native_notify_url") + "/wx/pay";
log.info("回调地址:{}", config.notifyUrl);
config.refundNotifyUrl = "";
config.transferNotifyUrl = paramsService.getSysParamValue("native_notify_url") + "/wx/transfer";
log.info("转账回调地址:{}", config.transferNotifyUrl);
}
public BaseWx getAppService() {

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

@@ -192,7 +192,7 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
memberConfig.setMemberPriceShopIdList(JSONObject.toJSONString(memberDTO.getMemberPriceShopIdList()));
}
shopConfigService.editStatusByShopIdList(memberConfig.getShopId(), memberConfig.getIsOpen().intValue() == 1 && memberConfig.getIsMemberPrice() == 1 ? 1 : 0,false, "is_account_ay",
shopConfigService.editStatusByShopIdList(memberConfig.getShopId(), memberConfig.getIsOpen().intValue() == 1 && memberConfig.getIsMemberPrice() == 1 ? 1 : 0,false, "is_member_price",
"ALL".equals(memberConfig.getMemberPriceShopType()) ? "all" : "part",
StrUtil.isNotBlank(memberConfig.getMemberPriceShopIdList()) ? JSONArray.parseArray(memberConfig.getMemberPriceShopIdList()).toList(Long.class) : new ArrayList<>());