From b5174dce3d446ff1cc3e2ccc4af3f79232dad79f Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Tue, 25 Apr 2023 16:36:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=B8=BB=E9=A1=B5=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8A=A0=E8=A7=84=E5=88=99=EF=BC=8C=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=94=B9=E5=8F=98=E6=8E=A5=E5=8F=A3=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E6=96=B9=E5=BC=8F=EF=BC=8Cvip=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=EF=BC=8C=E5=90=8E=E5=8F=B0=E8=90=A5?= =?UTF-8?q?=E4=B8=9A=E6=89=A7=E7=85=A7=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E9=93=B6=E7=9B=9B=E5=9B=9E=E8=B0=83=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E5=9C=A8=E6=B5=8B=E8=AF=95=E6=9C=8D=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MerchantOrderController.java | 4 +-- .../interceptor/TokenRegistryInterceptor.java | 1 + .../controller/home/HomeController.java | 25 +++++++++++++++++-- .../MerchantStoreController.java | 7 ++++-- .../channel/ys/impl/YSAuditServiceV3.java | 10 +++++--- .../impl/account/AccountServiceImpl.java | 8 +++--- .../impl/MerchantOrderServiceImpl.java | 20 +++++++++++++++ .../ys/impl/v20220527/YsConfigV3.java | 8 +++--- 8 files changed, 66 insertions(+), 17 deletions(-) diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java index 24fecb4..f691bda 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java @@ -1296,8 +1296,8 @@ public class MerchantOrderController { merchantIncomeService.saveMerchantIncome(merchantIncome); } - @GetMapping("/couponList/{orderNumber}") - public Result>> getCouponListByOrderNumber(@PathVariable("orderNumber") String orderNumber) { + @GetMapping("/couponList") + public Result>> getCouponListByOrderNumber(String orderNumber) { List> couponList = merchantOrderService.getCouponList(orderNumber); return ResultGenerator.genSuccessResult(couponList); } diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java index 1b1e7d8..9ddb816 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java @@ -58,6 +58,7 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter { limitUri.add("/api/merchantOrder/posScanPay"); limitUri.add("/api/merchantOrder/pos/tradeQuery"); limitUri.add("/api/merchantOrder/returnOrder"); + limitUri.add("/api/memberOrder"); boolean passFlag = limitUri.stream().anyMatch(s -> s.equals(requestUri) || requestUri.startsWith(s)); if (passFlag) { return true; diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java index 59f1846..55cb099 100644 --- a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java +++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java @@ -77,11 +77,24 @@ public class HomeController extends BaseNoModelController { BigDecimal yestDayNowTransAmt = merchantOrderService.getPlatformAmtYestNowData(date,yestStartDate,yestEndDate); BigDecimal toDayTransCount = orderData.get("toDayTransCount") == null ? BigDecimal.ZERO :BigDecimal.valueOf((double)orderData.get("toDayTransCount")); BigDecimal subtract = toDayTransCount.subtract(yestDayNowTransAmt); - BigDecimal scale = subtract.divide(yestDayNowTransAmt,4,BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_DOWN); + BigDecimal scale; + if((BigDecimal.ZERO).compareTo(yestDayNowTransAmt) == 0){ + scale = new BigDecimal("0.00"); + }else { + scale = subtract.divide(yestDayNowTransAmt,4,BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_DOWN); + } result.putAll(orderData); result.putAll(refundData); result.putAll(otherData); - result.putAll(amtData); + if(amtData == null){ + HashMap amtDataMap = new HashMap<>(16); + amtDataMap.put("toDayProfitCount", "0.00"); + amtDataMap.put("toDayShareCount", "0.00"); + amtDataMap.put("toDayFansCount", "0.00"); + result.putAll(amtDataMap); + } else { + result.putAll(amtData); + } result.putAll(transData); PlatformData yesterDayData = platformDataService.censusPlatformData(); result.put("yesterDay",yesterDayData); @@ -121,6 +134,14 @@ public class HomeController extends BaseNoModelController { return ResultGenerator.genSuccessResult("获取成功",result); } + public static void main(String[] args) { + HashMap objectObjectHashMap = new HashMap<>(); + objectObjectHashMap.put("toDayProfitCount", "0.00"); + objectObjectHashMap.put("toDayShareCount", "0.00"); + objectObjectHashMap.put("toDayFansCount", "0.00"); + System.out.println(objectObjectHashMap); + + } @PostMapping("/logout") @ResponseBody public Map login(HttpServletRequest request) { diff --git a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java index 2d8e9ea..6c55057 100644 --- a/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java +++ b/pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java @@ -4,6 +4,7 @@ import cn.pluss.platform.annotation.PassToken; import cn.pluss.platform.api.Result; import cn.pluss.platform.api.ResultGenerator; import cn.pluss.platform.channel.MerchantAuditService; +import cn.pluss.platform.channel.ys.YSAuditServiceV3; import cn.pluss.platform.common.CommonRemarkService; import cn.pluss.platform.controller.BaseNoModelController; import cn.pluss.platform.entitiy.ShiroUser; @@ -85,6 +86,8 @@ public class MerchantStoreController extends BaseNoModelController { @Setter(onMethod_ = {@Autowired, @Qualifier("ysAuditServiceV2")}) private MerchantAuditService ysAuditServiceV2; + @Resource + private YSAuditServiceV3 ysAuditServiceV3; /** @@ -462,8 +465,8 @@ public class MerchantStoreController extends BaseNoModelController { try { JSONObject params = new JSONObject(); params.put("userId", ua.getUserId() + ""); - ysAuditServiceV2.merchantAudit(ua.getUserId() + "", false); - // userAppService.merchantAudit(params, "4"); + //ysAuditServiceV2.merchantAudit(ua.getUserId() + "", false); + ysAuditServiceV3.merchantAuditV3(String.valueOf(ua.getUserId()), false); // userAppService.merchantAudit(params, "4"); result.put("code", "1"); result.put("msg", "发起进件成功, 稍后查看进件状态"); return result; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java index 98e7296..6aad5f2 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/channel/ys/impl/YSAuditServiceV3.java @@ -476,9 +476,13 @@ public class YSAuditServiceV3 implements cn.pluss.platform.channel.ys.YSAuditSer if (!mbi.getMerchantType().equals(MerchantBaseInfo.MERCH_TYPE_MICRO)) { busInfo.setBusNm(mbi.getBussAuthName()); busInfo.setBusNo(mbi.getBussAuthNum()); - busInfo.setBusCertBgn(mbi.getBussAuthStartTime().replace("-", "")); - //TODO 有时营业执照有效日期没有填写 - busInfo.setBusCertExpire(mbi.getBussAuthEndTime().replace("-", "")); + if (mbi.getBussAuthStartTime() == null || mbi.getBussAuthEndTime() == null){ + throw new MsgException("营业执照日期有误"); + } + busInfo.setBusCertBgn(mbi.getBussAuthStartTime().replace("年","") + .replace("月", "").replace("日", "")); + busInfo.setBusCertExpire(mbi.getBussAuthEndTime().replace("年","") + .replace("月", "").replace("日", "")); busInfo.setBusAddr(mbi.getBussAuthAddress()); busInfo.setBusCertType("19"); } else { diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java index 1e66dd2..265dcc6 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java @@ -390,9 +390,9 @@ public class AccountServiceImpl extends ServiceImpl impl account.setBankCardId(accountDTO.getBankCard().getId() + ""); save(account); - if (!accountDTO.getChannelType().equals(Account.CHANNEL_TYPE_D1)) { - return; - } +// if (!accountDTO.getChannelType().equals(Account.CHANNEL_TYPE_D1)) { +// return; +// } // 如果不存在D0的结算信息，则直接将D1的结算信息带过来 LambdaQueryWrapper qWrapperAccountD1 = Wrappers.lambdaQuery(); @@ -1161,7 +1161,7 @@ public class AccountServiceImpl extends ServiceImpl impl bankCardDTO.setBankHolder(certName); try { - aliyunService.checkBankCorrect(bankCardDTO.getPhone(), bankCardDTO.getBankCardNo(), accountIdCard.getCertNo(), certName); + aliyunService.checkBankCorrectNow(bankCardDTO.getPhone(), bankCardDTO.getBankCardNo(), accountIdCard.getCertNo(), certName); } catch (MsgException e) { throw new MsgException("银行卡信息校验不通过，请填写结算人【" + DesensitizedUtil.chineseName(certName) + "】的银行卡"); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java index 83e965f..cb6d2ef 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java @@ -69,6 +69,7 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; import lombok.val; import org.apache.commons.lang3.StringUtils; +import org.junit.Test; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -76,6 +77,8 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; import java.io.*; @@ -839,6 +842,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl param = new LinkedMultiValueMap<>(16); + String useFee = BigDecimal.valueOf(menber.getUsableRechargeFee() + menber.getUsableGiveFee()).setScale(2,BigDecimal.ROUND_HALF_DOWN).toString(); + param.add("type", userDTO.getType()); + param.add("rechargeMoney", userDTO.getRechargeMoney()); + param.add("storeId", userDTO.getStoreId()); + param.add("phone", userDTO.getPhone()); + param.add("useFee", useFee); + param.add("memberCode",menber.getMemberCode()); + String s = restTemplate.postForObject(baseUrl, param, String.class); + System.out.println("搞定"); + } /** * @param order * @param dto diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java index 3135383..3e6bfb7 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java @@ -40,10 +40,10 @@ public class YsConfigV3 { public static final String REQ_SUCCESS = "00000"; public static final String BIZ_SUCCESS = "0000"; - - public static final String AUDIT_NOTIFY_URL = "https://ky.sxczgkj.cn/api/auditCallback/ysV3"; - - public static final String AUDIT_SIGN_NOTIFY_URL = "https://ky.sxczgkj.cn/api/auditCallback/ysSignV3"; + //银盛进件回调 + public static final String AUDIT_NOTIFY_URL = "http://wxgzh.sxczgkj.cn/api/auditCallback/ysV3"; + //银盛签约回调 + public static final String AUDIT_SIGN_NOTIFY_URL = "http://wxgzh.sxczgkj.cn/api/auditCallback/ysSignV3"; /** 成功 */ public static final String STATUS_SUCCESS = "00";