diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java index 82bccaba2..63c6e7e30 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java @@ -43,8 +43,7 @@ public class LinePaySubmitRequest { private String branchBankName; @ApiModelProperty("缴纳时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date payTime; + private String payTime; @ApiModelProperty("付款截图") private String payPic; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index ece8505c8..226b53295 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -1,6 +1,7 @@ package com.cool.store.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.cool.store.dao.HyPartnerUserInfoDAO; 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.request.LinePaySubmitRequest; 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.constant.Constants; import com.cool.store.vo.LinePayVO; @@ -133,7 +135,7 @@ public class LinePayServiceImpl implements LinePayService { linePayDO.setBankName(request.getBankName()); linePayDO.setBranchBankCode(request.getBranchBankCode()); 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.setPromisePic(request.getPromisePic()); linePayDO.setPayStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index 294c1eb4f..ef59ad550 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -441,6 +441,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码 shopInfoDO.setSupervisorUserId(supervisor.getUserId());//更新督导 + SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).build()); + shopInfoDO.setShopName(systemBuildingShopDO.getStoreName());//更新铺位名称 shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java index 106d363b2..157431756 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java @@ -33,15 +33,14 @@ public class KdzApiController { public ResponseResult auditResult(@PathVariable(value = "enterprise-id") String eid, @RequestBody XfsgOpenApiRequest request) { log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); - //todo 暂时去掉验签测试 -// if(!verifyMD5(request,eid)){ -// log.error("验签失败,request:{};eid:{}",JSONObject.toJSONString(request),eid); -// return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); -// } -// if(eid == null || request.getBizContent() == null){ -// log.error("参数校验失败,BizContent:{}",JSONObject.toJSONString(request.getBizContent())); -// return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); -// } + if(!verifyMD5(request,eid)){ + log.error("验签失败,request:{};eid:{}",JSONObject.toJSONString(request),eid); + return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); + } + if(eid == null || request.getBizContent() == null){ + log.error("参数校验失败,BizContent:{}",JSONObject.toJSONString(request.getBizContent())); + return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + } AuditResultRequest auditResultRequest = JSONObject.parseObject(request.getBizContent(), AuditResultRequest.class); return ResponseResult.success(kdzApiService.auditResult(auditResultRequest)); } @@ -50,7 +49,7 @@ public class KdzApiController { @PostMapping("/license") public ResponseResult license(@PathVariable(value = "enterprise-id") String eid, @RequestBody XfsgOpenApiRequest request) { - log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); + log.info("license requestBody :{}", JSONObject.toJSONString(request)); if(!verifyMD5(request,eid)){ log.error("验签失败,request:{};eid:{}",JSONObject.toJSONString(request),eid); return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE);