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
2026-01-09 11:29:53 +08:00
parent 3a70c1ced3
commit cab370d1e1
7 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java
View File

@@ -81,6 +81,7 @@ public class EntryManagerMqListener {
merchant.setAlipayOrderId(resp.getAlipayOrderId()); merchant.setAlipayOrderId(resp.getAlipayOrderId());
merchant.setAlipayStatus(resp.getAlipayStatus()); merchant.setAlipayStatus(resp.getAlipayStatus());
merchant.setAlipayAuthInfo(resp.getAlipayAuthInfo());
merchant.setAlipayErrorMsg(resp.getAlipayErrorMsg()); merchant.setAlipayErrorMsg(resp.getAlipayErrorMsg());
shopDirectMerchantService.updateById(merchant); shopDirectMerchantService.updateById(merchant);
} }

2
cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
View File

@@ -80,7 +80,7 @@ public class EntryManagerTask {
} }
shopDirectMerchantService.updateById(shopDirectMerchant); shopDirectMerchantService.updateById(shopDirectMerchant);
if (StrUtil.isNotBlank(wechatMerchantId) || StrUtil.isNotBlank(alipayMerchantId)) { if (StrUtil.isNotBlank(wechatMerchantId) || StrUtil.isNotBlank(alipayMerchantId)) {
shopInfoService.editEntry(shopDirectMerchant.getShopId(), wechatMerchantId, alipayMerchantId); shopInfoService.editEntry(shopDirectMerchant.getShopId(), wechatMerchantId, alipayMerchantId, shopDirectMerchant.getAlipayAuthInfo());
} }
} }
} }

2
cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java
View File

@@ -131,7 +131,7 @@ public class RabbitPublisher {
} }
/** /**
* 订单商品状态消息 * 进件
*/ */
public void sendEntryManagerMsg(String shopId) { public void sendEntryManagerMsg(String shopId) {
sendMsg(RabbitConstants.Queue.SHOP_ENTRY_MANAGER, shopId); sendMsg(RabbitConstants.Queue.SHOP_ENTRY_MANAGER, shopId);

4
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
View File

@@ -150,6 +150,10 @@ public class ShopInfo implements Serializable {
* 支付宝商户id * 支付宝商户id
*/ */
private String alipayMerchantId; private String alipayMerchantId;
/**
* 支付宝授权信息
*/
private String alipayAuthInfo;
/** /**
* 到期时间 * 到期时间

7
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java
View File

@@ -23,8 +23,9 @@ public interface ShopInfoService extends IService<ShopInfo> {
/** /**
* 检测开关 * 检测开关
* @param shopId 店铺id *
* @param switchType ShopInfo的某列 开关 目前只支持Integer类型字段 * @param shopId 店铺id
* @param switchType ShopInfo的某列 开关 目前只支持Integer类型字段
* @return true:开启 false:关闭 * @return true:开启 false:关闭
*/ */
boolean checkSwitch(Long shopId, ShopSwitchTypeEnum switchType) throws ValidateException; boolean checkSwitch(Long shopId, ShopSwitchTypeEnum switchType) throws ValidateException;
@@ -40,7 +41,7 @@ public interface ShopInfoService extends IService<ShopInfo> {
/** /**
* 进件结果保存 * 进件结果保存
*/ */
Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId); Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId, String alipayAuthInfo);
ShopDetailDTO detail(Long id) throws CzgException; ShopDetailDTO detail(Long id) throws CzgException;

5
cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopDirectMerchant.java
View File

@@ -106,6 +106,11 @@ public class ShopDirectMerchant implements Serializable {
*/ */
private String alipayStatus; private String alipayStatus;
/**
* 支付宝授信息
*/
private String alipayAuthInfo;
/** /**
* 支付宝进件错误信息 * 支付宝进件错误信息
*/ */

3
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
View File

@@ -326,10 +326,11 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
@Override @Override
@CacheEvict(key = "#shopId") @CacheEvict(key = "#shopId")
public Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId) { public Boolean editEntry(Long shopId, String wechatMerchantId, String alipayMerchantId, String alipayAuthInfo) {
ShopInfo shopInfo = new ShopInfo(); ShopInfo shopInfo = new ShopInfo();
shopInfo.setWechatMerchantId(wechatMerchantId); shopInfo.setWechatMerchantId(wechatMerchantId);
shopInfo.setAlipayMerchantId(alipayMerchantId); shopInfo.setAlipayMerchantId(alipayMerchantId);
shopInfo.setAlipayAuthInfo(alipayAuthInfo);
return update(shopInfo, new QueryWrapper().eq(ShopInfo::getId, shopId)); return update(shopInfo, new QueryWrapper().eq(ShopInfo::getId, shopId));
} }