suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixBug

Browse Source
This commit is contained in:
guohb
2024-05-17 14:51:23 +08:00
parent dc2a5c71ff
commit ecfe42b40f
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java
View File

@@ -43,8 +43,7 @@ public class LinePaySubmitRequest {
private String branchBankName; private String branchBankName;
@ApiModelProperty("缴纳时间") @ApiModelProperty("缴纳时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String payTime;
private Date payTime;
@ApiModelProperty("付款截图") @ApiModelProperty("付款截图")
private String payPic; private String payPic;

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.service.impl; package com.cool.store.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cool.store.dao.HyPartnerUserInfoDAO; import com.cool.store.dao.HyPartnerUserInfoDAO;
import com.cool.store.dao.LineInfoDAO; import com.cool.store.dao.LineInfoDAO;
@@ -20,6 +21,7 @@ import com.cool.store.mapper.LineInfoMapper;
import com.cool.store.mapper.ShopInfoMapper; import com.cool.store.mapper.ShopInfoMapper;
import com.cool.store.request.LinePaySubmitRequest; import com.cool.store.request.LinePaySubmitRequest;
import com.cool.store.service.LinePayService; import com.cool.store.service.LinePayService;
import com.cool.store.utils.poi.DateUtils;
import com.cool.store.utils.poi.StringUtils; import com.cool.store.utils.poi.StringUtils;
import com.cool.store.utils.poi.constant.Constants; import com.cool.store.utils.poi.constant.Constants;
import com.cool.store.vo.LinePayVO; import com.cool.store.vo.LinePayVO;
@@ -133,7 +135,7 @@ public class LinePayServiceImpl implements LinePayService {
linePayDO.setBankName(request.getBankName()); linePayDO.setBankName(request.getBankName());
linePayDO.setBranchBankCode(request.getBranchBankCode()); linePayDO.setBranchBankCode(request.getBranchBankCode());
linePayDO.setBranchBankName(request.getBranchBankName()); linePayDO.setBranchBankName(request.getBranchBankName());
linePayDO.setPayTime(request.getPayTime()); linePayDO.setPayTime(DateUtils.dateTime("yyyy-MM-dd HH:mm:ss",request.getPayTime()));
linePayDO.setPayPic(request.getPayPic()); linePayDO.setPayPic(request.getPayPic());
linePayDO.setPromisePic(request.getPromisePic()); linePayDO.setPromisePic(request.getPromisePic());
linePayDO.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); linePayDO.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode());

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
View File

@@ -441,6 +441,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId());
shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码 shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码
shopInfoDO.setSupervisorUserId(supervisor.getUserId());//更新督导 shopInfoDO.setSupervisorUserId(supervisor.getUserId());//更新督导
SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build());
shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称
shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO);
shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER);
shopAuditInfoDO.setPassReason(request.getCause()); shopAuditInfoDO.setPassReason(request.getCause());

19
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java
View File

@@ -33,15 +33,14 @@ public class KdzApiController {
public ResponseResult<Boolean> auditResult(@PathVariable(value = "enterprise-id") String eid, public ResponseResult<Boolean> auditResult(@PathVariable(value = "enterprise-id") String eid,
@RequestBody XfsgOpenApiRequest request) { @RequestBody XfsgOpenApiRequest request) {
log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); log.info("auditResult requestBody :{}", JSONObject.toJSONString(request));
//todo 暂时去掉验签测试 if(!verifyMD5(request,eid)){
// if(!verifyMD5(request,eid)){ log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid);
// log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE);
// return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); }
// } if(eid == null || request.getBizContent() == null){
// if(eid == null || request.getBizContent() == null){ log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent()));
// log.error("参数校验失败,BizContent：{}",JSONObject.toJSONString(request.getBizContent())); return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
// return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); }
// }
AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class); AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class);
return ResponseResult.success(kdzApiService.auditResult(auditResultRequest)); return ResponseResult.success(kdzApiService.auditResult(auditResultRequest));
} }
@@ -50,7 +49,7 @@ public class KdzApiController {
@PostMapping("/license") @PostMapping("/license")
public ResponseResult<LicenseApiResponse> license(@PathVariable(value = "enterprise-id") String eid, public ResponseResult<LicenseApiResponse> license(@PathVariable(value = "enterprise-id") String eid,
@RequestBody XfsgOpenApiRequest request) { @RequestBody XfsgOpenApiRequest request) {
log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); log.info("license requestBody :{}", JSONObject.toJSONString(request));
if(!verifyMD5(request,eid)){ if(!verifyMD5(request,eid)){
log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid); log.error("验签失败,request：{};eid:{}",JSONObject.toJSONString(request),eid);
return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE);