提交代码

yy_dev
胡锐 2 years ago
parent 71ffc282f9
commit d156ff7b5a
  1. 96
      cweb/src/main/java/com/cweb/controller/TestController.java
  2. 2
      schedule/src/main/java/com/hfkj/schedule/Merchant.java
  3. 2
      service/src/main/java/com/hfkj/channel/lakala/LaKaLaTradeService.java
  4. 172
      service/src/main/java/com/hfkj/channel/saas/SaasActivityService.java
  5. 71
      service/src/main/java/com/hfkj/channel/saas/SaasMerService.java
  6. 1
      service/src/main/java/com/hfkj/channel/saas/config/SaasConfig.java
  7. 73
      service/src/main/java/com/hfkj/channel/saas/utils/GenerateAgreementUtil.java
  8. 9
      service/src/main/java/com/hfkj/common/StreamGobbler.java
  9. 1
      service/src/main/java/com/hfkj/config/CommonSysConfig.java
  10. 1
      service/src/main/java/com/hfkj/service/impl/BsAuditServiceImpl.java
  11. 1
      service/src/main/java/com/hfkj/service/impl/BsMerSettleAcctApplyServiceImpl.java
  12. 2
      service/src/main/java/com/hfkj/sysenum/MerSettleAcctApplyStatus.java
  13. 2
      service/src/main/resources/dev/commonConfig.properties

@ -13,7 +13,10 @@ import com.hfkj.channel.lakala.LaKaLaMerService;
import com.hfkj.channel.lakala.LaKaLaTradeSeparateService;
import com.hfkj.channel.lakala.LaKaLaTradeService;
import com.hfkj.channel.lakala.config.LaKaLaConfig;
import com.hfkj.channel.saas.SaasActivityService;
import com.hfkj.channel.saas.SaasMerService;
import com.hfkj.channel.saas.config.SaasConfig;
import com.hfkj.channel.saas.utils.GenerateAgreementUtil;
import com.hfkj.channel.saas.utils.SaasCommon;
import com.hfkj.channel.saas.saasenum.FileImgType;
import com.hfkj.channel.saas.utils.SaasMerRequest;
@ -31,10 +34,17 @@ import com.hfkj.entity.BsLklMcc;
import com.hfkj.entity.BsTradeOrder;
import com.hfkj.entity.BsTradeOrderProfitSharing;
import com.hfkj.entity.SecRegion;
import com.hfkj.model.MerBasisModel;
import com.hfkj.model.ResponseData;
import com.hfkj.service.*;
import com.hfkj.sysenum.MerTypeEnum;
import freemarker.template.Configuration;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@ -43,11 +53,12 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.File;
import java.io.*;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.function.Consumer;
@Controller
@RequestMapping(value = "/test")
@ -93,6 +104,11 @@ public class TestController {
private BsTradeOrderService tradeOrderService;
@Resource
private BsTradeOrderProfitSharingService tradeOrderProfitSharingService;
@Resource
private BsMerService merService;
@Resource
private SaasActivityService saasActivityService;
@RequestMapping(value="/saasGetToken",method = RequestMethod.GET)
@ResponseBody
@ -281,14 +297,23 @@ public class TestController {
}
}
@RequestMapping(value="/imageUpload",method = RequestMethod.GET)
@RequestMapping(value="/saasActivity",method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "图片上传")
public ResponseData imageUpload() {
@ApiOperation(value = "saasActivity")
public ResponseData saasActivity() {
try {
return ResponseMsgUtil.success(AlipayRequest.imageUpload("C:/Users/hurui/Desktop/default_oil_station.jpg"));
// return ResponseMsgUtil.success(saasActivityService.queryAgentActivityStatus("284"));
List<String> externalCustomerNos = new ArrayList<>();
externalCustomerNos.add("822290058120KK2");
externalCustomerNos.add("822290058120LMB");
// return ResponseMsgUtil.success(saasActivityService.customerRegisterActivity("6000000417", null, externalCustomerNos));
return ResponseMsgUtil.success(saasActivityService.agentRegisterActivity("6000000417"));
// return ResponseMsgUtil.success(saasActivityService.queryAgentActivity());
/*return ResponseMsgUtil.success(saasActivityService.queryCustomerActivityStatus("284", "822290058120KK2"));
*/
} catch (Exception e) {
log.error(e.getMessage(), e);
return ResponseMsgUtil.exception(e);
@ -300,8 +325,58 @@ public class TestController {
@ApiOperation(value = "图片上传")
public ResponseData generate() {
try {
/* Configuration cfg = new Configuration();
Template template = configuration.getTemplate("indexHTKWECHAT_PAY.html");*/
MerBasisModel merDetail = merService.getMerDetail(57L);
Configuration cfg = new Configuration();
cfg.setDirectoryForTemplateLoading(new File("D:/home"));
Template template = cfg.getTemplate("indexHTKWECHAT_PAY.html");
Map<String,Object> param = new HashMap<>();
param.put("width", "100%");
param.put("tbTitleWidth", "120px");
param.put("tbConWidth", "100px");
Map<String,Object> fee = new HashMap<>();
fee.put("customerName", merDetail.getBlisName());
param.put("fee", fee);
// 执照信息
if (merDetail.getMerType().equals(MerTypeEnum.status3.getNumber())) {
param.put("licenseNo", "");
param.put("legalName", "");
param.put("licenseName", "");
param.put("identityNo", "");
param.put("address", "") ;
param.put("identityNoExpire", "");
param.put("receiveDetail", "");
} else {
param.put("licenseNo", merDetail.getBlisNo());
param.put("legalName", merDetail.getLarName());
param.put("licenseName", merDetail.getBlisName());
param.put("identityNo", merDetail.getLarIdCard());
param.put("address", merDetail.getMerRegion().getProvinceName()+merDetail.getMerRegion().getCityName()+merDetail.getMerRegion().getAreaName()) ;
param.put("identityNoExpire", merDetail.getLarIdCardPeriodStart() + " —— " + merDetail.getLarIdCardPeriodEnd());
param.put("receiveDetail", merDetail.getMerRegion().getAddress());
}
// 结算信息
param.put("accountName", merDetail.getMerSettleAcct().getBankName());
param.put("accountIdCard", merDetail.getMerSettleAcct().getSettleIdCardNo());
param.put("accountNo", merDetail.getMerSettleAcct().getBankCardNo());
param.put("accountIdDtEnd", merDetail.getMerSettleAcct().getSettleIdCardPeriodStart() + " —— " + merDetail.getMerSettleAcct().getSettleIdCardPeriodEnd());
param.put("bankName", merDetail.getMerSettleAcct().getOpenningBankName());
// 商户信息
param.put("licenseName", merDetail.getBlisName());
param.put("mail", merDetail.getRegEmail());
param.put("contactManName", merDetail.getRegName());
param.put("phone", merDetail.getRegPhone());
param.put("channelType", merDetail.getMerIndustry().getChildName());
param.put("receiveDetail", merDetail.getStoreModel().getStoreRegion().getAddress());
param.put("agencyName", "重庆惠付科技有限公司");
GenerateAgreementUtil.createAgreementPicture(merDetail.getId(),GenerateAgreementUtil.writeHtml(merDetail.getId(),template, param));
return ResponseMsgUtil.success(null);
@ -311,6 +386,7 @@ public class TestController {
}
}
@RequestMapping(value = "/rebate", method = RequestMethod.GET)
@ResponseBody
@ApiOperation(value = "返利")

@ -328,7 +328,7 @@ public class Merchant {
merSettleAcctApplyService.editData(merSettleAcctApply);
} else if (responseObj.getString("reviewPass").equals("UNPASS")) {
merSettleAcctApply.setStatus(MerSettleAcctApplyStatus.status4.getNumber());
merSettleAcctApply.setStatus(MerSettleAcctApplyStatus.status6.getNumber());
merSettleAcctApply.setRejectReason(responseObj.getString("reviewResult"));
merSettleAcctApplyService.editData(merSettleAcctApply);
}

@ -187,7 +187,7 @@ public class LaKaLaTradeService {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户号");
}
// 查询终端号
BsMerPlatformTerm merPlatformTerm = merPlatformTermService.getMerPlatformTerm(platformNo.getId(), "PAPER_CODE");
BsMerPlatformTerm merPlatformTerm = merPlatformTermService.getMerPlatformTerm(platformNo.getId(), "WECHAT_PAY");
if (merPlatformTerm == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到商户终端号");
}

@ -0,0 +1,172 @@
package com.hfkj.channel.saas;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.channel.saas.config.SaasConfig;
import com.hfkj.channel.saas.utils.RSAUtil;
import com.hfkj.channel.saas.utils.SaasCommon;
import com.hfkj.common.exception.ErrorCode;
import com.hfkj.common.exception.ErrorHelp;
import com.hfkj.common.exception.SysCode;
import com.hfkj.common.utils.HttpsUtils;
import jdk.nashorn.internal.ir.annotations.Reference;
import org.apache.commons.codec.binary.Base64;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
* 活动服务
* @className: SaasActivityService
* @author: HuRui
* @date: 2023/5/12
**/
@Component
public class SaasActivityService {
@Resource
private SaasCommon saasCommon;
/**
* 查询服务商活动
* @return
*/
public JSONArray queryAgentActivityList() {
try {
Map<String,Object> param = new HashMap<>();
param.put("agentNo", SaasConfig.userNo);
Map<String,Object> header = new HashMap<>();
header.put("Authorization", "Bearer " + saasCommon.getToken());
JSONObject obj = new JSONObject();
obj.put("data", Base64.encodeBase64String(RSAUtil.encryptByPrivateKey(JSONObject.toJSONString(param).getBytes(), Base64.decodeBase64(RSAUtil.PRIVATE_KEY))));
JSONObject responseObj = HttpsUtils.doPost(SaasConfig.requestUrl + "htkmarketing/open/welfare/activity", obj, header);
System.out.println("参数:" + JSONObject.toJSONString(param));
System.out.println("加密:" + obj.getString("data"));
System.out.println("request:" + obj.toJSONString());
System.out.println("response:" + responseObj.toJSONString());
if (responseObj == null || !responseObj.getString("code").equals("000000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseObj.getString("message"));
}
return JSONArray.parseArray(new String(RSAUtil.decryptByPublicKey(Base64.decodeBase64(responseObj.getString("data")), Base64.decodeBase64(RSAUtil.PUBLIC_KEY))));
} catch (Exception e) {
System.out.println(e);
return null;
}
}
/**
* 查询服务商参与状态查询
* @param activityId
* @return
*/
public JSONObject queryAgentActivityStatus(String activityId) throws Exception {
Map<String,Object> param = new HashMap<>();
param.put("activityId", activityId);
param.put("agentNo", SaasConfig.userNo);
Map<String,Object> header = new HashMap<>();
header.put("Authorization", "Bearer " + saasCommon.getToken());
JSONObject obj = new JSONObject();
obj.put("data", Base64.encodeBase64String(RSAUtil.encryptByPrivateKey(JSONObject.toJSONString(param).getBytes(), Base64.decodeBase64(RSAUtil.PRIVATE_KEY))));
JSONObject responseObj = HttpsUtils.doPost(SaasConfig.requestUrl + "https://test.wsmsd.cn/sit/htkmarketing/open/welfare/agent/status", obj, header);
System.out.println("参数:" + JSONObject.toJSONString(param));
System.out.println("加密:" + obj.getString("data"));
System.out.println("request:" + obj.toJSONString());
System.out.println("response:" + responseObj.toJSONString());
if (responseObj == null || !responseObj.getString("code").equals("000000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseObj.getString("message"));
}
return JSONObject.parseObject(new String(RSAUtil.decryptByPublicKey(Base64.decodeBase64(responseObj.getString("data")), Base64.decodeBase64(RSAUtil.PUBLIC_KEY))));
}
/**
* 查询商户参与状态查询
* @param activityId
* @param externalCustomerNo 外部商户号
* @return
*/
public JSONObject queryCustomerActivityStatus(String activityId,String externalCustomerNo) throws Exception {
Map<String,Object> param = new HashMap<>();
param.put("activityId", activityId);
param.put("externalCustomerNo", externalCustomerNo);
Map<String,Object> header = new HashMap<>();
header.put("Authorization", "Bearer " + saasCommon.getToken());
JSONObject obj = new JSONObject();
obj.put("data", Base64.encodeBase64String(RSAUtil.encryptByPrivateKey(JSONObject.toJSONString(param).getBytes(), Base64.decodeBase64(RSAUtil.PRIVATE_KEY))));
JSONObject responseObj = HttpsUtils.doPost(SaasConfig.requestUrl + "htkmarketing/open/welfare/customer/status", obj, header);
System.out.println("参数:" + JSONObject.toJSONString(param));
System.out.println("加密:" + obj.getString("data"));
System.out.println("request:" + obj.toJSONString());
System.out.println("response:" + responseObj.toJSONString());
if (responseObj == null || !responseObj.getString("code").equals("000000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseObj.getString("message"));
}
return JSONObject.parseObject(new String(RSAUtil.decryptByPublicKey(Base64.decodeBase64(responseObj.getString("data")), Base64.decodeBase64(RSAUtil.PUBLIC_KEY))));
}
/**
* 服务商报名活动
* @return
*/
public JSONObject agentRegisterActivity(String activityId) throws Exception {
Map<String,Object> param = new HashMap<>();
param.put("agentNo", SaasConfig.userNo);
param.put("activityId", activityId);
Map<String,Object> header = new HashMap<>();
header.put("Authorization", "Bearer " + saasCommon.getToken());
JSONObject obj = new JSONObject();
obj.put("data", Base64.encodeBase64String(RSAUtil.encryptByPrivateKey(JSONObject.toJSONString(param).getBytes(), Base64.decodeBase64(RSAUtil.PRIVATE_KEY))));
JSONObject responseObj = HttpsUtils.doPost(SaasConfig.requestUrl + "htkmarketing/open/welfare/agent/register", obj, header);
System.out.println("参数:" + JSONObject.toJSONString(param));
System.out.println("加密:" + obj.getString("data"));
System.out.println("request:" + obj.toJSONString());
System.out.println("response:" + responseObj.toJSONString());
if (responseObj == null || !responseObj.getString("code").equals("000000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseObj.getString("message"));
}
return responseObj;
}
/**
* 商户报名活动
* @return
*/
public JSONObject customerRegisterActivity(String activityId, String branchBankNo, List<String> externalCustomerNos) throws Exception {
Map<String,Object> param = new HashMap<>();
param.put("activityId", activityId);
param.put("branchBankNo", branchBankNo);
param.put("externalCustomerNos", externalCustomerNos);
Map<String,Object> header = new HashMap<>();
header.put("Authorization", "Bearer " + saasCommon.getToken());
JSONObject obj = new JSONObject();
obj.put("data", Base64.encodeBase64String(RSAUtil.encryptByPrivateKey(JSONObject.toJSONString(param).getBytes(), Base64.decodeBase64(RSAUtil.PRIVATE_KEY))));
JSONObject responseObj = HttpsUtils.doPost(SaasConfig.requestUrl + "htkmarketing/open/welfare/customer/register", obj, header);
System.out.println("参数:" + JSONObject.toJSONString(param));
System.out.println("加密:" + obj.getString("data"));
System.out.println("request:" + obj.toJSONString());
System.out.println("response:" + responseObj.toJSONString());
if (responseObj == null || !responseObj.getString("code").equals("000000")) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, responseObj.getString("message"));
}
return responseObj;
}
}

@ -3,6 +3,7 @@ package com.hfkj.channel.saas;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.hfkj.channel.saas.config.SaasConfig;
import com.hfkj.channel.saas.utils.GenerateAgreementUtil;
import com.hfkj.channel.saas.utils.RSAUtil;
import com.hfkj.channel.saas.utils.SaasCommon;
import com.hfkj.channel.saas.utils.SaasMerRequest;
@ -19,6 +20,8 @@ import com.hfkj.sysenum.MerAttachType;
import com.hfkj.sysenum.MerSettleType;
import com.hfkj.sysenum.MerTypeEnum;
import com.hfkj.sysenum.PlatformTypeEnum;
import freemarker.template.Configuration;
import freemarker.template.Template;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@ -214,6 +217,12 @@ public class SaasMerService {
attchMapList.add(attchMap);
}
// 协议
attchMap = new HashMap<>();
attchMap.put("type", MerAttachType.type11.getLklCode());
attchMap.put("id", saasCommon.fileUpload(new File(CommonSysConst.getSysConfig().getFile_url() +"/"+ generateAddContract(basisModel)), MerAttachType.type11.getLklCode(), "0").getString("url"));
attchMapList.add(attchMap);
body.put("bizContent", bizContent);
body.put("attchments", attchMapList);
body.put("businessContent", basisModel.getMerIndustry().getChildName());
@ -516,4 +525,66 @@ public class SaasMerService {
return str;
}
/**
* 生成进件协议
* @param merDetail
* @return
*/
public static String generateAddContract(MerBasisModel merDetail) {
try {
Configuration cfg = new Configuration();
cfg.setDirectoryForTemplateLoading(new File("D:/home"));
Template template = cfg.getTemplate("indexHTKWECHAT_PAY.html");
Map<String,Object> param = new HashMap<>();
param.put("width", "100%");
param.put("tbTitleWidth", "120px");
param.put("tbConWidth", "100px");
Map<String,Object> fee = new HashMap<>();
fee.put("customerName", merDetail.getBlisName());
param.put("fee", fee);
// 执照信息
if (merDetail.getMerType().equals(MerTypeEnum.status3.getNumber())) {
param.put("licenseNo", "");
param.put("legalName", "");
param.put("licenseName", "");
param.put("identityNo", "");
param.put("address", "") ;
param.put("identityNoExpire", "");
param.put("receiveDetail", "");
} else {
param.put("licenseNo", merDetail.getBlisNo());
param.put("legalName", merDetail.getLarName());
param.put("licenseName", merDetail.getBlisName());
param.put("identityNo", merDetail.getLarIdCard());
param.put("address", merDetail.getMerRegion().getProvinceName()+merDetail.getMerRegion().getCityName()+merDetail.getMerRegion().getAreaName()) ;
param.put("identityNoExpire", merDetail.getLarIdCardPeriodStart() + " —— " + merDetail.getLarIdCardPeriodEnd());
param.put("receiveDetail", merDetail.getMerRegion().getAddress());
}
// 结算信息
param.put("accountName", merDetail.getMerSettleAcct().getBankName());
param.put("accountIdCard", merDetail.getMerSettleAcct().getSettleIdCardNo());
param.put("accountNo", merDetail.getMerSettleAcct().getBankCardNo());
param.put("accountIdDtEnd", merDetail.getMerSettleAcct().getSettleIdCardPeriodStart() + " —— " + merDetail.getMerSettleAcct().getSettleIdCardPeriodEnd());
param.put("bankName", merDetail.getMerSettleAcct().getOpenningBankName());
// 商户信息
param.put("licenseName", merDetail.getBlisName());
param.put("mail", merDetail.getRegEmail());
param.put("contactManName", merDetail.getRegName());
param.put("phone", merDetail.getRegPhone());
param.put("channelType", merDetail.getMerIndustry().getChildName());
param.put("receiveDetail", merDetail.getStoreModel().getStoreRegion().getAddress());
param.put("agencyName", "重庆惠付科技有限公司");
return GenerateAgreementUtil.createAgreementPicture(merDetail.getId(),GenerateAgreementUtil.writeHtml(merDetail.getId(),template, param));
} catch (Exception e) {
return null;
}
}
}

@ -9,6 +9,7 @@ import com.hfkj.config.CommonSysConst;
**/
public class SaasConfig {
public static String requestUrl = CommonSysConst.getSysConfig().getLkl_saas_request_url();
public static String requestMerRegistrationTokenUrl = CommonSysConst.getSysConfig().getLkl_saas_request_mer_registration_token_url();
public static String requestMerRegistrationUrl = CommonSysConst.getSysConfig().getLkl_saas_request_mer_registration_url();
public static String requestMerRegistrationCommonUrl = CommonSysConst.getSysConfig().getLkl_saas_request_mer_registration_common_url();

@ -0,0 +1,73 @@
package com.hfkj.channel.saas.utils;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import net.coobird.thumbnailator.Thumbnails;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Map;
/**
* 生成协议工具
* @className: GenerateAgreementUtil
* @author: HuRui
* @date: 2023/5/15
**/
public class GenerateAgreementUtil {
private static final Logger log = LoggerFactory.getLogger(GenerateAgreementUtil.class);
/**
* 生成html文件数据
* @param template
* @param data
* @return
* @throws IOException
* @throws TemplateException
*/
// html 替换占位符
public static File writeHtml(Long merId,Template template, Map<String, Object> data) throws IOException, TemplateException {
String fileName = merId+"/"+System.currentTimeMillis()+".html";
File htmlFile = new File("D:/home", fileName);
FileWriter sw = new FileWriter(htmlFile);
log.info("生成协议html, 地址:{}, 参数:{} ", htmlFile.getAbsolutePath(), data);
template.process(data, sw);
return htmlFile;
}
/**
* html文件 png 示例代码
* @param htmlFile html文件
* @return
* @throws IOException
*/
public static String createAgreementPicture(Long merId,File htmlFile) throws IOException {
String fileName = merId+"/"+htmlFile.getName() + ".jpg";
File outputFile = new File("D:/home", htmlFile.getName() + ".jpg");
log.info("生成图片开始, HTML地址 {}, 图片地址:{}", htmlFile.getAbsolutePath(), outputFile.getAbsolutePath());
// windows
String commandProcess = "cmd.exe /c wkhtmltoimage --width 400 --quality 94 " + htmlFile.getPath() + " " + outputFile.getPath();
// String commandProcess = "wkhtmltoimage --width 400 --quality 94 " + htmlFile.getPath() + " " + outputFile.getPath();
log.info("协议执行procommand:{}", commandProcess);
long startTime = System.currentTimeMillis(); //获取开始时间
Process process = Runtime.getRuntime().exec(commandProcess);
try {
int exitVal = process.waitFor();
log.info("协议html转换png结果:{}", exitVal);
} catch (InterruptedException e) {
e.printStackTrace();
log.info("协议html转换png错误:{}", e.getMessage());
throw new IOException(e);
}
long endTime = System.currentTimeMillis(); //获取结束时间
log.info("程序运行时间: " + (endTime - startTime) + "ms");
log.info("生成图片结束,地址: {}", outputFile.getPath());
Thumbnails.of(outputFile).scale(1).outputQuality(0.9).toFile(outputFile);
return fileName;
}
}

@ -0,0 +1,9 @@
package com.hfkj.common;
/**
* @className: StreamGobbler
* @author: HuRui
* @date: 2023/5/12
**/
public class StreamGobbler {
}

@ -93,6 +93,7 @@ public class CommonSysConfig {
private String lkl_saas_client_secret;
private String lkl_saas_activity_id;
private String lkl_saas_user_no;
private String lkl_saas_request_url;
private String lkl_saas_request_mer_registration_token_url;
private String lkl_saas_request_mer_registration_url;
private String lkl_saas_request_mer_update_url;

@ -78,6 +78,7 @@ public class BsAuditServiceImpl implements BsAuditService {
if (audit.getVocationalWorkType().equals(AuditVocationalWorkType.type1.getNumber())) {
BsMerSettleAcctApply acctApply = merSettleAcctApplyService.getApplyById(audit.getAuditObjectId());
if (acctApply != null) {
acctApply.setStatus(MerSettleAcctApplyStatus.status5.getNumber());
merSettleAcctApplyService.applyUpdateSettleAcct(acctApply);
}
}

@ -81,7 +81,6 @@ public class BsMerSettleAcctApplyServiceImpl implements BsMerSettleAcctApplyServ
@Override
public BsMerSettleAcctApply applyUpdateSettleAcct(BsMerSettleAcctApply merSettleAcctApply) {
merSettleAcctApply.setStatus(MerSettleAcctApplyStatus.status2.getNumber());
editData(merSettleAcctApply);
saasMerService.updateSettleApply(merSettleAcctApply.getId());

@ -14,6 +14,8 @@ public enum MerSettleAcctApplyStatus {
status2(2, "审核中"),
status3(3, "通过"),
status4(4, "驳回"),
status5(5, "渠道审核中"),
status6(6, "渠道驳回"),
;
private Integer number;

@ -24,6 +24,7 @@ lkl_micro_pay_ret_url=https://gratia-pay.dctpay.com/crest/laKaLaNotify/microPay
#lkl_saas_client_secret=EguwEckByf2I6u6z
#lkl_saas_activity_id=37
#lkl_saas_user_no=20000101
#lkl_saas_request_url=https://test.wsmsd.cn/sit/
#lkl_saas_request_mer_registration_token_url=https://test.wsmsd.cn/sit/htkauth/oauth/token
#lkl_saas_request_mer_registration_url=https://test.wsmsd.cn/sit/htkregistration/merchant/
#lkl_saas_request_mer_update_url=https://test.wsmsd.cn/sit/htk-api/
@ -36,6 +37,7 @@ lkl_saas_client_id=huifu
lkl_saas_client_secret=f65VVjqJfLtc177F
lkl_saas_activity_id=12
lkl_saas_user_no=22206482
lkl_saas_request_url=https://tkapi.lakala.com/
lkl_saas_request_mer_registration_token_url=https://tkapi.lakala.com/auth/oauth/token
lkl_saas_request_mer_registration_url=https://htkactvi.lakala.com/registration/merchant/
lkl_saas_request_mer_update_url=https://htkapi.lakala.com/api/

Loading…
Cancel
Save