From f2bcba36f7c73fd7c93a0027224f87256262f793 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 18 Nov 2024 14:14:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=8B=E8=AF=95=C2=B7=E5=B0=8F=E6=91=8A?= =?UTF-8?q?=E8=AE=B8=E5=8F=AF=E8=AF=81=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/service/impl/AliyunServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java index d977c25ac..ed787df50 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java @@ -184,6 +184,7 @@ public class AliyunServiceImpl implements AliyunService { foodLicenseVO.setMainBusiness(mainBusiness); foodLicenseVO.setLicenceNumber(licenceNumber); foodLicenseVO.setOperatorName(operatorName); + log.info("食营解析结果VO：{}",JSONObject.toJSONString(foodLicenseVO)); return foodLicenseVO; } return null; From 14ad2a7da712c3c2c7483055dfce06127a557413 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 18 Nov 2024 14:34:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E7=BC=B4=E7=BA=B3=E6=84=8F=E5=90=91?= =?UTF-8?q?=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/LinePayServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 ec2736fbd..ec1f19b36 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 @@ -211,6 +211,9 @@ public class LinePayServiceImpl implements LinePayService { if(PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())){ String key = MessageFormat.format(CommonConstants.AMOUNT_KEY, eid, request.getLineId()); String getAmount = redisUtilPool.getString(key); + if (StringUtils.isBlank(getAmount)){ + linePayDO.setAmount(new BigDecimal(3000)); + } linePayDO.setAmount(new BigDecimal(getAmount)); } From 081ae420df3c13287ab9134f10af76df2df1a4c4 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 18 Nov 2024 14:37:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20=E7=BC=B4=E7=BA=B3=E6=84=8F=E5=90=91?= =?UTF-8?q?=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LinePayServiceImpl.java | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) 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 ec1f19b36..8e6696437 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 @@ -72,6 +72,7 @@ public class LinePayServiceImpl implements LinePayService { ShopInfoMapper shopInfoMapper; @Autowired private RedisUtilPool redisUtilPool; + @Override public LinePayVO getLinePayInfo(Long lineId, Integer businessType, Long shopId) { LinePayVO result = null; @@ -86,6 +87,7 @@ public class LinePayServiceImpl implements LinePayService { } return result; } + @Override public Boolean setAmount(Long lineId, String amount) { String key = MessageFormat.format(CommonConstants.AMOUNT_KEY, eid, lineId); @@ -105,13 +107,13 @@ public class LinePayServiceImpl implements LinePayService { @Override public Boolean skipPay(Long lineId, LoginUserInfo user) { - log.info("skipPay lineId:{},操作人:{}",lineId,user.getName()); + log.info("skipPay lineId:{},操作人:{}", lineId, user.getName()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); if (lineInfo == null) { - throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); + throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } - if ( !WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode().equals(lineInfo.getWorkflowSubStageStatus())) { - throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE); + if (!WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode().equals(lineInfo.getWorkflowSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE); } lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.SIGN_INTENT_AGREEMENT.getCode()); lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()); @@ -125,7 +127,7 @@ public class LinePayServiceImpl implements LinePayService { @Transactional(rollbackFor = Exception.class) public Long submitPayInfo(LinePaySubmitRequest request, PartnerUserInfoVO partnerUser) { log.info("submitPayInfo request：{}，partnerUser：{}", JSONObject.toJSONString(request), JSONObject.toJSONString(partnerUser)); - if (Objects.isNull(request.getPayBusinessType())){ + if (Objects.isNull(request.getPayBusinessType())) { request.setPayBusinessType(Constants.ZERO_INTEGER); } LineInfoDO lineInfo = new LineInfoDO(); @@ -145,11 +147,11 @@ public class LinePayServiceImpl implements LinePayService { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72); Map requestMap = new HashMap<>(); ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); - requestMap.put("storeName",shopInfoDO.getShopName()); - requestMap.put("partnerName",lineInfo.getUsername()); - requestMap.put("partnerMobile",lineInfo.getMobile()); - requestMap.put("lineId",String.valueOf(lineInfo.getId())); - requestMap.put("shopId",String.valueOf(shopInfoDO.getId())); + requestMap.put("storeName", shopInfoDO.getShopName()); + requestMap.put("partnerName", lineInfo.getUsername()); + requestMap.put("partnerMobile", lineInfo.getMobile()); + requestMap.put("lineId", String.valueOf(lineInfo.getId())); + requestMap.put("shopId", String.valueOf(shopInfoDO.getId())); //commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_18,requestMap); } if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())) { @@ -157,17 +159,17 @@ public class LinePayServiceImpl implements LinePayService { lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); lineInfoDAO.insertOrUpdate(lineInfo); Map requestMap = new HashMap<>(); - requestMap.put("partnerUsername",lineInfo.getUsername()); - requestMap.put("payTime",DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, linePayDO.getPayTime())); - requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("partnerUsername", lineInfo.getUsername()); + requestMap.put("payTime", DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, linePayDO.getPayTime())); + requestMap.put("lineId", String.valueOf(lineInfo.getId())); // commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_5,requestMap); } return payId == null ? null : payId; } private LinePayDO checkAndFill(LinePayDO linePayDO, - LinePaySubmitRequest request, - PartnerUserInfoVO partnerUser) { + LinePaySubmitRequest request, + PartnerUserInfoVO partnerUser) { if (Objects.isNull(linePayDO)) { linePayDO = new LinePayDO(); fillLinePay(Boolean.TRUE, linePayDO, request, partnerUser); @@ -188,7 +190,7 @@ public class LinePayServiceImpl implements LinePayService { linePayDO.setBankName(request.getBankName()); linePayDO.setBranchBankCode(request.getBranchBankCode()); linePayDO.setBranchBankName(request.getBranchBankName()); - linePayDO.setPayTime(DateUtils.dateTime("yyyy-MM-dd HH:mm:ss",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()); @@ -208,13 +210,14 @@ public class LinePayServiceImpl implements LinePayService { linePayDO.setUpdateUserId(partnerUser.getPartnerId()); } } - if(PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())){ + if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())) { String key = MessageFormat.format(CommonConstants.AMOUNT_KEY, eid, request.getLineId()); String getAmount = redisUtilPool.getString(key); - if (StringUtils.isBlank(getAmount)){ + if (StringUtils.isBlank(getAmount)) { linePayDO.setAmount(new BigDecimal(3000)); + } else { + linePayDO.setAmount(new BigDecimal(getAmount)); } - linePayDO.setAmount(new BigDecimal(getAmount)); } }