支付调整

2026-01-14 17:04:48 +08:00
parent e8be5dee9d
commit 4eaedcce41
70 changed files with 1065 additions and 829 deletions
--- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
@@ -3,9 +3,9 @@ package com.czg.controller;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.czg.CzgPayUtils;
+import com.czg.PolyPayUtils;
 import com.czg.constants.PayTypeConstants;
-import com.czg.entity.CzgBaseRespParams;
+import com.czg.entity.PolyBaseResp;
 import com.czg.market.entity.MkShopConsumeDiscountRecord;
 import com.czg.market.service.MkDistributionUserService;
 import com.czg.market.service.MkShopConsumeDiscountRecordService;
@@ -61,8 +61,8 @@ public class NotifyController {


    @RequestMapping("/payCallBack")
-    public String notifyCallBack(@RequestBody CzgBaseRespParams respParams) {
-        JSONObject czg = CzgPayUtils.getCzg(respParams);
+    public String notifyCallBack(@RequestBody PolyBaseResp respParams) {
+        JSONObject czg = PolyPayUtils.getCzg(respParams);
        AssertUtil.isNull(czg, "支付回调数据为空");
        log.info("支付回调数据为:{}", czg);
        orderInfoCustomService.payCallBackOrder(czg.getString("mchOrderNo"), czg, 0);
@@ -89,10 +89,10 @@ public class NotifyController {

    @RequestMapping("/native/wx/pay/distributionRecharge")
    public String nativeNotify(HttpServletRequest request) throws IOException {
-        String timestamp = request.getHeader("Wechatpay-Timestamp");
-        String nonce = request.getHeader("Wechatpay-Nonce");
-        String serialNo = request.getHeader("Wechatpay-Serial");
-        String signature = request.getHeader("Wechatpay-Signature");
+//        String timestamp = request.getHeader("Wechatpay-Timestamp");
+//        String nonce = request.getHeader("Wechatpay-Nonce");
+//        String serialNo = request.getHeader("Wechatpay-Serial");
+//        String signature = request.getHeader("Wechatpay-Signature");
        String result = IoUtil.readUtf8(request.getInputStream());
        JSONObject jsonObject = JSONObject.parseObject(result);
        JSONObject resource = jsonObject.getJSONObject("resource");
@@ -127,8 +127,8 @@ public class NotifyController {


    @RequestMapping("/refundCallBack")
-    public String refundCallBack(@RequestBody CzgBaseRespParams respParams) {
-        JSONObject czg = CzgPayUtils.getCzg(respParams);
+    public String refundCallBack(@RequestBody PolyBaseResp respParams) {
+        JSONObject czg = PolyPayUtils.getCzg(respParams);
        AssertUtil.isNull(czg, "退款回调数据为空");
        log.info("退款回调数据为:{}", czg);
        orderInfoCustomService.refundCallBackOrder(czg.getString("mchOrderNo"), czg);
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMerchantController.java
@@ -1,18 +1,18 @@
 package com.czg.controller.admin;

-import com.czg.account.dto.merchant.ShopMerchantEditDTO;
-import com.czg.account.entity.ShopMerchant;
-import com.czg.account.service.ShopMerchantService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.annotation.SaAdminCheckRole;
+import com.czg.order.dto.ShopMerchantDTO;
+import com.czg.order.entity.ShopDirectMerchant;
+import com.czg.order.service.ShopMerchantService;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 /**
 * 商户信息管理
+ *
 * @author Administrator
 */
@RestController
@@ -24,25 +24,36 @@ public class ShopMerchantController {
    /**
     * 商户支付信息获取
     * 权限标识: shopMerchant:detail
+     *
     * @param shopId 店铺id
     * @return 支付信息
     */
    @SaAdminCheckRole("管理员")
    @SaAdminCheckPermission(parentName = "支付参数信息", value = "shopMerchant:detail", name = "商户支付信息获取")
    @GetMapping
-    public CzgResult<ShopMerchant> detail(@RequestParam Integer shopId) {
+    public CzgResult<ShopMerchantDTO> detail(@RequestParam Long shopId) {
        return CzgResult.success(shopMerchantService.detail(shopId));
    }

    /**
     * 商户支付信息修改
     * 权限标识: shopMerchant:edit
+     *
     * @return 是否成功
     */
    @SaAdminCheckRole("管理员")
    @SaAdminCheckPermission(parentName = "支付参数信息", value = "shopMerchant:edit", name = "商户支付信息修改")
    @PutMapping
-    public CzgResult<Boolean> edit(@RequestBody @Validated ShopMerchantEditDTO shopMerchantEditDTO) {
-        return CzgResult.success(shopMerchantService.edit(shopMerchantEditDTO));
+    public CzgResult<Boolean> edit(@RequestBody ShopMerchantDTO shopMerchant) {
+        shopMerchant.setShopId(StpKit.USER.getShopId());
+        return CzgResult.success(shopMerchantService.editEntry(shopMerchant, true));
+    }
+
+    /**
+     * 获取当前店铺的主店进件信息
+     */
+    @GetMapping("getMainMerchant")
+    public CzgResult<ShopDirectMerchant> getMainMerchant() {
+        return CzgResult.success(shopMerchantService.getMainMerchant(StpKit.USER.getShopId()));
    }
 }
--- a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
@@ -4,9 +4,12 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.czg.EntryManager;
 import com.czg.PayCst;
-import com.czg.account.service.ShopInfoService;
+import com.czg.constant.PayChannelCst;
 import com.czg.dto.resp.QueryStatusResp;
+import com.czg.order.dto.ShopMerchantDTO;
 import com.czg.order.entity.ShopDirectMerchant;
+import com.czg.order.service.ShopMerchantService;
+import com.czg.pay.NativeMerchantDTO;
 import com.czg.service.order.service.ShopDirectMerchantService;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
@@ -28,7 +31,7 @@ public class EntryManagerTask {
    @Resource
    private ShopDirectMerchantService shopDirectMerchantService;
    @DubboReference
-    private ShopInfoService shopInfoService;
+    private ShopMerchantService shopMerchantService;

    //每10分钟查一次
    @Scheduled(cron = "0 0/10 * * * ? ")
@@ -58,7 +61,8 @@ public class EntryManagerTask {
                QueryStatusResp wechatStatus = EntryManager.queryWechatEntryStatus(shopDirectMerchant.getWechatApplyId());
                shopDirectMerchant.setWechatStatus(wechatStatus.getStatus());
                shopDirectMerchant.setWechatErrorMsg(wechatStatus.getFailReason());
-                shopDirectMerchant.setWechatSignUrl(wechatStatus.getSignUrl());
+                shopDirectMerchant.setWechatSignUrl("");
+                shopDirectMerchant.setWechatMerchantId(wechatStatus.getThirdMerchantId());
                if (PayCst.EntryStatus.FINISH.equals(wechatStatus.getStatus())) {
                    wechatMerchantId = wechatStatus.getThirdMerchantId();
                }
@@ -67,14 +71,24 @@ public class EntryManagerTask {
                QueryStatusResp alipayStatus = EntryManager.queryAlipayEntryStatus(shopDirectMerchant.getAlipayOrderId());
                shopDirectMerchant.setAlipayStatus(alipayStatus.getStatus());
                shopDirectMerchant.setAlipayErrorMsg(alipayStatus.getFailReason());
-                shopDirectMerchant.setAlipaySignUrl(alipayStatus.getSignUrl());
+                shopDirectMerchant.setAlipaySignUrl("");
+                shopDirectMerchant.setAlipayMerchantId(alipayStatus.getThirdMerchantId());
                if (PayCst.EntryStatus.FINISH.equals(alipayStatus.getStatus())) {
                    alipayMerchantId = alipayStatus.getThirdMerchantId();
                }
            }
            shopDirectMerchantService.updateById(shopDirectMerchant);
            if (StrUtil.isNotBlank(wechatMerchantId) || StrUtil.isNotBlank(alipayMerchantId)) {
-                shopInfoService.editEntry(shopDirectMerchant.getShopId(), wechatMerchantId, alipayMerchantId, shopDirectMerchant.getAlipayAuthInfo());
+                ShopMerchantDTO shopMerchantDTO = new ShopMerchantDTO();
+                shopMerchantDTO.setShopId(shopId);
+                shopMerchantDTO.setChannel(PayChannelCst.NATIVE);
+                shopMerchantDTO.setRelatedLicenceNo(licenceNo);
+                NativeMerchantDTO nativeMerchantDTO = new NativeMerchantDTO();
+                nativeMerchantDTO.setWechatMerchantId(wechatMerchantId);
+                nativeMerchantDTO.setAlipayMerchantId(alipayMerchantId);
+                shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO);
+                shopMerchantDTO.setNativeMerchantDTO(nativeMerchantDTO);
+                shopMerchantService.editEntry(shopMerchantDTO, false);
            }
        }
    }