Skip to content

F
fit-finance
Commit 2f69d54c by 程裕兵
Options

feat:添加半屏小程序

parent 5cf40f4a
Showing with 48 additions and 5 deletions
app/src/main/resources/application-canary.yml
...@@ -23,3 +23,7 @@ finance: ...@@ -23,3 +23,7 @@ finance:
wx_app: "003" wx_app: "003"
url: url:
transDetail: /pay/transaction-record/detail?id= transDetail: /pay/transaction-record/detail?id=
wx:
component:
appId: wx34b8ca68dd4886db
\ No newline at end of file
app/src/main/resources/application-dev.yml
...@@ -23,3 +23,7 @@ finance: ...@@ -23,3 +23,7 @@ finance:
wx_app: "003" wx_app: "003"
url: url:
transDetail: /pay/transaction-record/detail?id= transDetail: /pay/transaction-record/detail?id=
wx:
component:
appId: wx85f8daf6cd2e57ce
app/src/main/resources/application-local.yml
...@@ -28,3 +28,7 @@ finance: ...@@ -28,3 +28,7 @@ finance:
wx_app: "003" wx_app: "003"
url: url:
transDetail: /pay/transaction-record/detail?id= transDetail: /pay/transaction-record/detail?id=
wx:
component:
appId: wx85f8daf6cd2e57ce
app/src/main/resources/application-prod.yml
...@@ -23,3 +23,7 @@ finance: ...@@ -23,3 +23,7 @@ finance:
wx_app: "003" wx_app: "003"
url: url:
transDetail: /pay/transaction-record/detail?id= transDetail: /pay/transaction-record/detail?id=
wx:
component:
appId: wx34b8ca68dd4886db
\ No newline at end of file
app/src/main/resources/application-rc.yml
...@@ -23,3 +23,7 @@ finance: ...@@ -23,3 +23,7 @@ finance:
wx_app: "003" wx_app: "003"
url: url:
transDetail: /pay/transaction-record/detail?id= transDetail: /pay/transaction-record/detail?id=
wx:
component:
appId: wxa56549a4098a9d32
\ No newline at end of file
service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
package com.jiejing.fitness.finance.service.merchant.impl; package com.jiejing.fitness.finance.service.merchant.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.jiejing.common.exception.BizException; import com.jiejing.common.exception.BizException;
import com.jiejing.common.model.PageVO; import com.jiejing.common.model.PageVO;
import com.jiejing.common.utils.collection.CollectionUtil; import com.jiejing.common.utils.collection.CollectionUtil;
import com.jiejing.common.utils.convert.BeanUtil; import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.common.utils.text.StringUtil;
import com.jiejing.common.utils.time.TimeUtil; import com.jiejing.common.utils.time.TimeUtil;
import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO; import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
import com.jiejing.fitness.enums.finance.EmbededXcxEnum; import com.jiejing.fitness.enums.finance.EmbededXcxEnum;
...@@ -73,6 +75,7 @@ import java.util.concurrent.Executor; ...@@ -73,6 +75,7 @@ import java.util.concurrent.Executor;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Resource; import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -120,13 +123,18 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -120,13 +123,18 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
@Resource @Resource
private WeXcxService weXcxService; private WeXcxService weXcxService;
@Resource(name = "financeThreadPool")
private Executor executor;
@Value("${wx.component.appId}")
private String wxComponentAppId;
private static final Integer WX_SUCCESS_CODE = 0;
private final static List<String> SPECIAL_FAIL_LIST = Lists.newArrayList( private final static List<String> SPECIAL_FAIL_LIST = Lists.newArrayList(
"该商户号类型暂不支持与该AppID关联" "该商户号类型暂不支持与该AppID关联"
); );
@Resource(name = "financeThreadPool")
private Executor executor;
@Override @Override
public Long apply(ApplyStudioMerchantParams params) { public Long apply(ApplyStudioMerchantParams params) {
...@@ -245,6 +253,11 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -245,6 +253,11 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
if (CollectionUtil.isEmpty(appIds)) { if (CollectionUtil.isEmpty(appIds)) {
return; return;
} }
String systemXcxAppId = this.listSystemXcxAppIds().stream().findFirst().orElse(null);
if (StringUtil.isBlank(systemXcxAppId)) {
return;
}
Map<String, StudioEmbeddedXcxApply> existMap = studioEmbeddedXcxApplyRpService.mapByStudioIdAndAppId( Map<String, StudioEmbeddedXcxApply> existMap = studioEmbeddedXcxApplyRpService.mapByStudioIdAndAppId(
studioId, appIds); studioId, appIds);
appIds.stream() appIds.stream()
...@@ -254,9 +267,16 @@ public class StudioMerchantServiceImpl implements StudioMerchantService { ...@@ -254,9 +267,16 @@ public class StudioMerchantServiceImpl implements StudioMerchantService {
StudioEmbeddedXcxApply entity = StudioEmbeddedXcxConvert.toEntity(studioId, appId); StudioEmbeddedXcxApply entity = StudioEmbeddedXcxConvert.toEntity(studioId, appId);
studioEmbeddedXcxApplyRpService.insert(entity); studioEmbeddedXcxApplyRpService.insert(entity);
try { try {
// TODO JSONObject result = weXcxService.addEmbeddedXcx(wxComponentAppId, appId, systemXcxAppId,
// weXcxService.addHalfScreenXcxAuth(); "申请半屏小程序");
Integer code = result.getInteger("errcode");
String message = result.getString("errmsg");
if (WX_SUCCESS_CODE.equals(code)) {
studioEmbeddedXcxApplyRpService.updateById(StudioEmbeddedXcxConvert.toSuccess(entity.getId())); studioEmbeddedXcxApplyRpService.updateById(StudioEmbeddedXcxConvert.toSuccess(entity.getId()));
} else {
studioEmbeddedXcxApplyRpService.updateById(
StudioEmbeddedXcxConvert.toRefuse(entity.getId(), message));
}
} catch (Exception e) { } catch (Exception e) {
log.error("bind embedded xcx fail {}, {}", studioId, appId, e); log.error("bind embedded xcx fail {}, {}", studioId, appId, e);
String fail = String fail =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment