feat:微信分付

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoterThirdAppPlusPayService.java

@@ -0,0 +1,23 @@
+package com.bsd.pjcloud.thirdparty.api.feign;
+
+import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.feign.annotation.NoToken;
+import com.bsd.pjcloud.wallet.api.entity.mch.MchManageEntity;
+import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+
+@FeignClient(contextId = "remoterThirdAppPlusPayService", value = ServiceNameConstants.THIRDPARTY_SERVICE)
+public interface RemoterThirdAppPlusPayService {
+
+    /**
+     * 编辑商户的回调
+     */
+    @NoToken
+    @PostMapping("/remoter/change-mch")
+    R<Boolean> remoterChangeMch(@RequestBody MchManageVo dto);
+
+}

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/pay/ThirdFzOrderDto.java

@@ -3,7 +3,13 @@ package com.bsd.pjcloud.thirdparty.dto.pay;
 import com.bsd.pjcloud.thirdparty.entity.pay.ThirdFzOrderEntity;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class ThirdFzOrderDto extends ThirdFzOrderEntity {
 
+    private LocalDateTime[] fzTimeList;
+
+    private LocalDateTime[] fzRefundTimeList;
+
 }

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/entity/pay/ThirdFzOrderEntity.java

@@ -26,6 +26,13 @@ public class ThirdFzOrderEntity extends Model<ThirdFzOrderEntity> {
     @Schema(description = "主键")
     private Long id;
 
+
+    /**
+     * 分账金额
+     */
+    @Schema(description = "分账金额")
+    private Integer price;
+
     /**
      * 支付订单号
      */

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/entity/pay/ThirdPayOrderEntity.java

@@ -84,6 +84,12 @@ public class ThirdPayOrderEntity extends Model<ThirdPayOrderEntity> {
     @Schema(description = "支付金额(分)")
     private Integer price;
 
+    /**
+     * 分账分掉的金额(分)
+     */
+    @Schema(description = "分账分掉的金额(分)")
+    private Integer fzPrice;
+
     /**
      * 支付状态
      */
@@ -156,6 +162,24 @@ public class ThirdPayOrderEntity extends Model<ThirdPayOrderEntity> {
     @Schema(description = "订单过期时间")
     private LocalDateTime expireTime;
 
+    /**
+     * 是否开启分账
+     */
+    @Schema(description = "是否开启分账")
+    private String enableFz;
+
+    /**
+     * 业务回调是否完成
+     */
+    @Schema(description = "业务回调是否完成")
+    private String isBizCallback;
+
+    /**
+     * 是否分账成功
+     */
+    @Schema(description = "是否分账成功")
+    private String isFzSuccess;
+
     /**
      * 创建人
      */

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/vo/pay/ThirdFzOrderVo.java

@@ -3,7 +3,10 @@ package com.bsd.pjcloud.thirdparty.vo.pay;
 import com.bsd.pjcloud.thirdparty.entity.pay.ThirdFzOrderEntity;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class ThirdFzOrderVo extends ThirdFzOrderEntity {
 
+
 }