update:支付修改

fengliang
1 parent 3622f86a
Showing 4 changed files with 47 additions and 174 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/domain/OrderWeChatPayBatch.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/dto/WeChatPayTradeDto.java
etrade-rpc/src/main/java/com/diligrp/etrade/rpc/resolver/WeChatPayRpcResolver.java
 package com.diligrp.etrade.order.domain;
  
 import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
@@ -18,13 +19,12 @@ public class OrderWeChatPayBatch {
     private List<String> codes;
  
     /** 市场自增主键 */
-    @NotNull(message = "市场id不能为空")
     private Long marketId;
  
     /** 付款人客户id */
     @NotNull(message = "买家客户id不能为空")
     private Long payerCustomerId;
-    @NotEmpty(message = "买家客户code不能为空")
+    @NotBlank(message = "买家客户code不能为空")
     private String payerCustomerCode;
  
     /** 付款常客id */
@@ -43,13 +43,6 @@ public class OrderWeChatPayBatch {
     @NotNull(message = "付款金额不能为空")
     private BigDecimal totlePayAmount;
  
-    @NotNull(message = "openId不能为空")
-    private String openId;
-
-    private String subAppid;
-
-    private String subOpenId;
-
     @NotNull(message = "店铺不能为空")
     private Long shopId;
  
@@ -61,6 +54,9 @@ public class OrderWeChatPayBatch {
     @Valid
     private OrderDeliveryDto delivery;
  
+    @NotBlank(message = "登陆编码不能为空")
+    private String code;
+
     public String getPayType() {
         return payType;
     }
@@ -149,30 +145,6 @@ public class OrderWeChatPayBatch {
         this.payerCustomerCode = payerCustomerCode;
     }
  
-    public String getOpenId() {
-        return openId;
-    }
-
-    public void setOpenId(String openId) {
-        this.openId = openId;
-    }
-
-    public String getSubAppid() {
-        return subAppid;
-    }
-
-    public void setSubAppid(String subAppid) {
-        this.subAppid = subAppid;
-    }
-
-    public String getSubOpenId() {
-        return subOpenId;
-    }
-
-    public void setSubOpenId(String subOpenId) {
-        this.subOpenId = subOpenId;
-    }
-
     public String getCustomerAbbr() {
         return customerAbbr;
     }
@@ -204,4 +176,12 @@ public class OrderWeChatPayBatch {
     public void setDelivery(OrderDeliveryDto delivery) {
         this.delivery = delivery;
     }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
 }
@@ -763,13 +763,12 @@ public class OrderServiceImpl implements OrderService {
         }
         List<String> paymentIdList = orderPaymentService.checkNotPayPaymentOrder(orderWeChatPayBatch.getCodes());
         if(paymentIdList!=null&&paymentIdList.size()>=1){
-            Message message= wxChatPayClose(paymentIdList,orderWeChatPayBatch.getMarketId(),orderWeChatPayBatch.getOpenId());
+            Message message= wxChatPayClose(paymentIdList,orderWeChatPayBatch.getMarketId());
             if(message!=null){
                 return message;
             }
         }
  
-        List<OrderPayment> orderPaymentList = new ArrayList<>();
         WeChatPayTradeDto weChatPayTradeDto = new WeChatPayTradeDto();
         //效验店铺
         ShopVo shop = orderGoodsService.checkShop(orderWeChatPayBatch.getShopId());
@@ -778,16 +777,11 @@ public class OrderServiceImpl implements OrderService {
         }
         //构建微信支付参数
         weChatPayTradeDto.setAmount(orderWeChatPayBatch.getTotlePayAmount().multiply(NumberTransform.ONE_HUNDERD).longValue());
-        weChatPayTradeDto.setPayType(orderWeChatPayBatch.getPayType());
-        weChatPayTradeDto.setType(WeChatPayType.TRADE.getCode());
-        weChatPayTradeDto.setFees(null);
-        weChatPayTradeDto.setAccountId(null);
-        weChatPayTradeDto.setSerialNo(orderWeChatPayBatch.getCodes().get(0));
+        weChatPayTradeDto.setType(orderWeChatPayBatch.getPayType());
+        weChatPayTradeDto.setCode(orderWeChatPayBatch.getCode());
+        weChatPayTradeDto.setOutTradeNo(orderWeChatPayBatch.getCodes().get(0));
         weChatPayTradeDto.setGoodsDesc(shop.getName());
-        weChatPayTradeDto.setOpenId(orderWeChatPayBatch.getOpenId());
-        weChatPayTradeDto.setSubMchId(shop.getWxMerchantNumber());
         weChatPayTradeDto.setNotifyUrl(OrderConstant.WECHATPAY_BACK_API);
-        weChatPayTradeDto.setMarketId(orderWeChatPayBatch.getMarketId());
         weChatPayTradeDto.setDescription("电子结算微信交易");
         WeChatPayTradeBackDto weChatPayTradeBackDto = orderPaymentService.WeChatPay(weChatPayTradeDto);
         if(weChatPayTradeBackDto == null){
@@ -810,8 +804,7 @@ public class OrderServiceImpl implements OrderService {
                         ,orderWeChatPayBatch.getPayerStoreCustomerId(),orderWeChatPayBatch.getPayerCustomerName(),orderWeChatPayBatch.getPayerPhone()
                         ,null,null,null,null,orderWeChatPayBatch.getOperateId(),orderWeChatPayBatch.getOperateName()
                         ,null,null,null,orderWeChatPayBatch.getCustomerAbbr(),weChatPayTradeBackDto.getPaymentId());
-                OrderPayVo payVo = orderPaymentService.createOrderPayment(order, orderPayDto, identityType,shop);
-                orderPaymentList.add(payVo.getOrderPayment());
+                orderPaymentService.createOrderPayment(order, orderPayDto, identityType,shop);
             }catch (PlatformServiceException pe){
                 LOGGER.info("微信支付异常，支付订单号：{}，异常信息{}",orderWeChatPayBatch.getCodes(),pe.getMessage());
                 wxChatPayCloseOnly(weChatPayTradeBackDto.getPaymentId(),orderWeChatPayBatch.getMarketId(),null);
@@ -827,14 +820,12 @@ public class OrderServiceImpl implements OrderService {
         //扣减库存T
         orderGoodsService.deductBatch(orderList,orderWeChatPayBatch.getPayerCustomerId(),orderWeChatPayBatch.getPayerCustomerName());
  
-        //保存待支付单
-        //orderPaymentService.saveBatch(orderPaymentList);
         //返回数据，由小程序发起微信支付。
         return Message.success(weChatPayTradeBackDto);
     }
  
     @Transactional(rollbackFor = Exception.class)
-    public Message wxChatPayClose(List<String> paymentIds, Long marketId, String openId) {
+    public Message wxChatPayClose(List<String> paymentIds, Long marketId) {
         for(String paymentId: paymentIds){
             RLock lock = redissonClient.getLock(OrderConstant.OrderLock + paymentId);
             try{
@@ -11,22 +11,12 @@ import java.util.List;
  * @Date 2024-3-25
  */
 public class WeChatPayTradeDto {
-    /**
-     * 交易类型
-     * 当前只支持10-充值 12-缴费
-     */
-    @NotNull(message = "type should not be null")
-    private Integer type;
+
     /**
      * 支付方式-JSAPI, NATIVE等
      */
     @NotNull(message = "payType should not be null")
-    private String payType;
-    /**
-     * 资金账号
-     */
-    private Long accountId;
-
+    private String type;
     /**
      * 微信商品描述-微信扫码支付时显示-不超过128个字符
      */
@@ -40,7 +30,11 @@ public class WeChatPayTradeDto {
     /**
      * 业务单号
      */
-    private String serialNo;
+    private String outTradeNo;
+    /**
+     * 小程序登陆凭证
+     */
+    private String code;
     /**
      * 支付结果通知URL
      */
@@ -50,81 +44,16 @@ public class WeChatPayTradeDto {
      */
     private String description;
  
-    /**
-     * 买卖家手续费
-     */
-    private List<FeeDto> fees;
-
-    /**
-     * 微信用户标识-JSAPI使用
-     */
-    private String openId;
-
-    /**
-     * 服务商的AppID
-     */
-    private String subMchId;
-
-    /**
-     * 服务商模式下，服务商APPID下的openId
-     */
-    private String subMchIdopenId;
-
-    /**
-     * 优惠卷信息
-     */
-    private List<DeductFeesDto> deductFees;
-
-    /**
-     * 市场id
-     */
     private Long marketId;
  
-    /**
-     *
-     */
-    private String paymentId;
-
-    public String getPaymentId() {
-        return paymentId;
-    }
-
-    public void setPaymentId(String paymentId) {
-        this.paymentId = paymentId;
-    }
-
-    public Long getMarketId() {
-        return marketId;
-    }
-
-    public void setMarketId(Long marketId) {
-        this.marketId = marketId;
-    }
-
-    public Integer getType() {
+    public String getType() {
         return type;
     }
  
-    public void setType(Integer type) {
+    public void setType(String type) {
         this.type = type;
     }
  
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType = payType;
-    }
-
-    public Long getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(Long accountId) {
-        this.accountId = accountId;
-    }
-
     public String getGoodsDesc() {
         return goodsDesc;
     }
@@ -141,12 +70,20 @@ public class WeChatPayTradeDto {
         this.amount = amount;
     }
  
-    public String getSerialNo() {
-        return serialNo;
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
     }
  
-    public void setSerialNo(String serialNo) {
-        this.serialNo = serialNo;
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
     }
  
     public String getNotifyUrl() {
@@ -165,43 +102,11 @@ public class WeChatPayTradeDto {
         this.description = description;
     }
  
-    public List<FeeDto> getFees() {
-        return fees;
-    }
-
-    public void setFees(List<FeeDto> fees) {
-        this.fees = fees;
-    }
-
-    public String getOpenId() {
-        return openId;
-    }
-
-    public void setOpenId(String openId) {
-        this.openId = openId;
-    }
-
-    public String getSubMchId() {
-        return subMchId;
-    }
-
-    public void setSubMchId(String subMchId) {
-        this.subMchId = subMchId;
-    }
-
-    public String getSubMchIdopenId() {
-        return subMchIdopenId;
-    }
-
-    public void setSubMchIdopenId(String subMchIdopenId) {
-        this.subMchIdopenId = subMchIdopenId;
-    }
-
-    public List<DeductFeesDto> getDeductFees() {
-        return deductFees;
+    public Long getMarketId() {
+        return marketId;
     }
  
-    public void setDeductFees(List<DeductFeesDto> deductFees) {
-        this.deductFees = deductFees;
+    public void setMarketId(Long marketId) {
+        this.marketId = marketId;
     }
 }
@@ -29,11 +29,11 @@ public class WeChatPayRpcResolver {
     /** 支付系统token */
     public static final String PAYMENT_TOKEN = "abcd2010";
     /** 创建预支付 */
-    public static final String PAY_STATE_PREPARE ="wechat.payment.service:prepare";
+    public static final String PAY_STATE_PREPARE ="hzbank.payment.service:prepay";
     /** 微信支付状态查询 */
-    public static final String PAY_STATE_CHECK ="wechat.payment.service:state";
+    public static final String PAY_STATE_CHECK ="hzbank.payment.service:state";
     /** 微信支付关闭订单 */
-    public static final String PAY_STATE_CLOSE ="wechat.payment.service:close";
+    public static final String PAY_STATE_CLOSE ="hzbank.payment.service:close";
 //    /** 微信支付历史交易查询 */
 //    public static final String PAY_STATE_INFO ="wechat.payment.service:statement";
 //    /** 微信支付退款 */
@@ -54,9 +54,6 @@ public class WeChatPayRpcResolver {
         //创建提交单
         weChatPayTradeDto.setNotifyUrl(backBaseUrl+weChatPayTradeDto.getNotifyUrl());
         weChatPayTradeDto.setDescription(weChatPayTradeDto.getDescription()==null?"电子交易结算":weChatPayTradeDto.getDescription());
-        if(weChatPayTradeDto.getAccountId()==null){
-            weChatPayTradeDto.setAccountId(1L);
-        }
         //组装headers
         HttpHeaders prepareHeaders = creatHeader(weChatPayTradeDto.getMarketId().toString(),PAY_STATE_PREPARE);
         Message<WeChatPayTradeBackDto> prepareJsonObject = payRpc.wechatPay(weChatPayTradeDto, prepareHeaders);