解冻

.idea/mybatisx/templates.xml

@@ -49,13 +49,12 @@
             <option name="tableUIInfoList">
               <list>
                 <TableUIInfo>
-                  <option name="className" value="AskaPlatform" />
-                  <option name="tableName" value="aska_platform" />
+                  <option name="className" value="Freeze" />
+                  <option name="tableName" value="freeze" />
                 </TableUIInfo>
               </list>
             </option>
             <option name="templatesName" value="default-all" />
-            <option name="useActualColumns" value="true" />
           </GenerateConfig>
         </option>
         <option name="moduleName" value="aska-dao" />

dao/src/main/java/com/mofangchuxing/aska/dao/domain/Freeze.java

@@ -0,0 +1,109 @@
+package com.mofangchuxing.aska.dao.domain;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @TableName freeze
+ */
+public class Freeze implements Serializable {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 
+     */
+    private String orderNo;
+
+    /**
+     * 
+     */
+    private String tranId;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * 
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * 
+     */
+    public String getTranId() {
+        return tranId;
+    }
+
+    /**
+     * 
+     */
+    public void setTranId(String tranId) {
+        this.tranId = tranId;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        Freeze other = (Freeze) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo()))
+            && (this.getTranId() == null ? other.getTranId() == null : this.getTranId().equals(other.getTranId()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode());
+        result = prime * result + ((getTranId() == null) ? 0 : getTranId().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", orderNo=").append(orderNo);
+        sb.append(", tranId=").append(tranId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

dao/src/main/java/com/mofangchuxing/aska/dao/mapper/FreezeMapper.java

@@ -0,0 +1,28 @@
+package com.mofangchuxing.aska.dao.mapper;
+
+import com.mofangchuxing.aska.dao.domain.Freeze;
+
+import java.util.List;
+
+/**
+* @author syl
+* @description 针对表【freeze】的数据库操作Mapper
+* @createDate 2023-12-11 14:27:36
+* @Entity com.mofangchuxing.aska.dao.domain.Freeze
+*/
+public interface FreezeMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Freeze record);
+
+    int insertSelective(Freeze record);
+
+    Freeze selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(Freeze record);
+
+    int updateByPrimaryKey(Freeze record);
+
+    List<Freeze> getAllList();
+}

dao/src/main/resources/mapper/FreezeMapper.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mofangchuxing.aska.dao.mapper.FreezeMapper">
+
+    <resultMap id="BaseResultMap" type="com.mofangchuxing.aska.dao.domain.Freeze">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
+            <result property="tranId" column="tran_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,order_no,tran_id
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from freeze
+        where  id = #{id,jdbcType=INTEGER} 
+    </select>
+    <select id="getAllList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from freeze
+        order by id
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from freeze
+        where  id = #{id,jdbcType=INTEGER} 
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.Freeze" useGeneratedKeys="true">
+        insert into freeze
+        ( id,order_no,tran_id
+        )
+        values (#{id,jdbcType=INTEGER},#{orderNo,jdbcType=VARCHAR},#{tranId,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.Freeze" useGeneratedKeys="true">
+        insert into freeze
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null">id,</if>
+                <if test="orderNo != null">order_no,</if>
+                <if test="tranId != null">tran_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null">#{id,jdbcType=INTEGER},</if>
+                <if test="orderNo != null">#{orderNo,jdbcType=VARCHAR},</if>
+                <if test="tranId != null">#{tranId,jdbcType=VARCHAR},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.mofangchuxing.aska.dao.domain.Freeze">
+        update freeze
+        <set>
+                <if test="orderNo != null">
+                    order_no = #{orderNo,jdbcType=VARCHAR},
+                </if>
+                <if test="tranId != null">
+                    tran_id = #{tranId,jdbcType=VARCHAR},
+                </if>
+        </set>
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.mofangchuxing.aska.dao.domain.Freeze">
+        update freeze
+        set 
+            order_no =  #{orderNo,jdbcType=VARCHAR},
+            tran_id =  #{tranId,jdbcType=VARCHAR}
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+</mapper>

dao/target/classes/mapper/FreezeMapper.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mofangchuxing.aska.dao.mapper.FreezeMapper">
+
+    <resultMap id="BaseResultMap" type="com.mofangchuxing.aska.dao.domain.Freeze">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
+            <result property="tranId" column="tran_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,order_no,tran_id
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from freeze
+        where  id = #{id,jdbcType=INTEGER} 
+    </select>
+    <select id="getAllList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from freeze
+        order by id
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from freeze
+        where  id = #{id,jdbcType=INTEGER} 
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.Freeze" useGeneratedKeys="true">
+        insert into freeze
+        ( id,order_no,tran_id
+        )
+        values (#{id,jdbcType=INTEGER},#{orderNo,jdbcType=VARCHAR},#{tranId,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.Freeze" useGeneratedKeys="true">
+        insert into freeze
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null">id,</if>
+                <if test="orderNo != null">order_no,</if>
+                <if test="tranId != null">tran_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null">#{id,jdbcType=INTEGER},</if>
+                <if test="orderNo != null">#{orderNo,jdbcType=VARCHAR},</if>
+                <if test="tranId != null">#{tranId,jdbcType=VARCHAR},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.mofangchuxing.aska.dao.domain.Freeze">
+        update freeze
+        <set>
+                <if test="orderNo != null">
+                    order_no = #{orderNo,jdbcType=VARCHAR},
+                </if>
+                <if test="tranId != null">
+                    tran_id = #{tranId,jdbcType=VARCHAR},
+                </if>
+        </set>
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.mofangchuxing.aska.dao.domain.Freeze">
+        update freeze
+        set 
+            order_no =  #{orderNo,jdbcType=VARCHAR},
+            tran_id =  #{tranId,jdbcType=VARCHAR}
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+</mapper>

dao/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -17,6 +17,7 @@ com/mofangchuxing/aska/dao/config/SqlConfig.class
 com/mofangchuxing/aska/dao/domain/AskaStat.class
 com/mofangchuxing/aska/dao/mapper/AskaSplitrecordMapper.class
 com/mofangchuxing/aska/dao/domain/AskaSplitrecord.class
+com/mofangchuxing/aska/dao/mapper/FreezeMapper.class
 com/mofangchuxing/aska/dao/mapper/RefundOrderMapper.class
 com/mofangchuxing/aska/dao/mapper/AskaChannelcouponnosMapper.class
 com/mofangchuxing/aska/dao/domain/SysMenu.class
@@ -25,3 +26,4 @@ com/mofangchuxing/aska/dao/mapper/AskaChannelsMapper.class
 com/mofangchuxing/aska/dao/domain/AskaCashrequest.class
 com/mofangchuxing/aska/dao/domain/AskaChannelcouponnos.class
 com/mofangchuxing/aska/dao/mapper/AskaChannelnosMapper.class
+com/mofangchuxing/aska/dao/domain/Freeze.class

dao/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -13,11 +13,13 @@
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaSplitrecord.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaPlatformMapper.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/RefundOrderMapper.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/FreezeMapper.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/PayRequest.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaChannelsMapper.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaPlatform.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/PayRequestMapper.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaChannelcouponnos.java
+/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/Freeze.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaCashrequestMapper.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaChannelnos.java
 /Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/NotifyRecord.java

main/src/main/java/com/mofangchuxing/aska/controller/AskaController.java

@@ -133,4 +133,16 @@ public class AskaController {
         delayNotifyComponent.handleSplit(payRequestDto.getOrderNo());
         return new ResponseResult<>();
     }
+
+    @RequestMapping("/queryLast")
+    public R queryLast(String transactionId){
+        JSONObject jsonObject = profitSharingService.queryLastMoney(transactionId);
+        return R.ok(jsonObject);
+    }
+
+    @RequestMapping("/freeze")
+    public R freeze() {
+        profitSharingService.freeze();
+        return R.ok();
+    }
 }

main/src/main/resources/apiclient_key.pem

@@ -1,28 +1,2 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCthKmfULCDNE+3
-R7k5RytJM0Bsbd4Zeqe+z3A8KnOS4ddzbS0NAidc2c5vtELfSWHl+E2HBTqkD4mN
-uqoT2MKfad2YwKnJyCP+3d8oUC0ynsQXoLgBSHmyCyqbOZ+lhoQx2kIV74nRJhsI
-z5i4fjusmYK+8vEBsCoKbB/8ep5CehCdL3lCgrT7YLWSRNVOQI9hl9Sm8ACIUz+C
-Vyfp7Nvr80oCux84S4bvNN07Tabt6KSMwobcOKNO81QQ+6og2V28r14TlTtqujBt
-6uMFHXiFlanVd++wuz+x6zPhu1hYBTBGA2gZpDehAUQD+dHgWQKAWB/YCRxPocg4
-Io+/FgIFAgMBAAECggEAPHTGbL2+YlhtldwlivFjAYQb5Ct7gMEdhPvdjPj1f620
-VYEqeyfO8yjoJj9WNVnqBCg5StvljJflQz5QV83kMYq/LKOkBKv47qn7QJ5+wO5U
-QC89LSVFUWVWmPLAzvlJQd1bvSzShc6TCMTb3xwMSpzJ0yHuGrp4S11U37ERRvOR
-M0drJbK8pakdDXMfmRTaBI61AO98BMf3mvJYbbvL4u9w3Q7vHqIJDuWnMH7JNx/o
-z7Ykd4/kZJHFAMSftMww7DnZWxlmy/4sLnT44Fh/SrWgQxDRcjip6xczR/gjVZg5
-+/6IoiXIvoPlRXEgPNlSEzhSjEck70+dLMfgk9n2wQKBgQDmqEEUmVw8wGrX3qmZ
-fkT/zWOv74PfsP0TS6EA9AF3xO7GwqD8PUO5/OYYx4nOFzLgHHyFb7rcjESD1qis
-31VSayC80oGOu5apesWIz0RXRsXydGRc+raflSEpNsa/IQLocsDPyKt6QID1FFvs
-F31iG46gxyowuETjHAztEXn26QKBgQDAlT8h8NCFAb2IPgrMGaibYUBNK8ptbyNy
-vsuj4Gnhx1M3+Mcadv4eD7fiUU02NTWIWZfp59tkRljfOPulxN6AIt1LHjN4ml1O
-+cUk39d5gpAAphqV7aAJHugmtJqOhbHx2qdgxILaherixrxZ6XznFh+xG00AjSeG
-ArZvlHH4vQKBgDr0gIXyWPgSOnzopbLc6mfzqGo8rxlK1LTM3N8wfvuM83cMIje2
-tQvhzzJANkHd/hv4S/+TOlDK7WxBPqXJA7boONrqd0DzQ6QYBEteptoj9c5t34VA
-c9NAO9Sb8prBpkuhoRS69tFtkUiTJpemvV6JKqB/p5ICV2ExN0CU+faZAoGAIY4f
-qO9HtdUezA1bXkKeQSyJwqh9peG2gHjEDLK+YCuV0WvUbUUMc/pzJMjbtjVBNZe+
-w2+1p1wmggZwump6BkOM4VjKyRnEZk1Yz1r9NVvNcX9/pF36A3zSIGRZhbm/zo81
-mMPEtQSeb5MHIHdxXuZY8Uf7e7wchdoVJY3s6dUCgYEAs3Nr2HITPV88T6uWqTCu
-Y9H5iAOgh3nUKgVtEqqcDiDiZW/WOGFoiC2ERmMdAfq9pez/LifpBbGgRZgyFqDU
-KOorQk0nA6c2ycqIN57sF+v4AqdH/Kijzbjg8751/SDK3ZP3EOW6n07aVxcx4MQq
-Til1mtXx/275XG7NfFnA9Eg=
------END PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDX4m6xPrPELZrefvnCBzfaRSKLogXfYMv+Z2SWTWbEcqAAr+xgExFmN9Z5M5Ve+oBFL9Vk2zHZZd+x8CJDyXLyDC0EI19P8o/94Oc8weiJBwQFKpjO+tama9Smnz8f/+98LEzkdDCKNYSaQPP7p/Bor3cqfrU1HF+rVMfNld8aio8WEMVfj1vr9Ladc92fQSSdLDYOjx291P3bG+CNuauNdU0RFNAu6eEOUktwMLXEqiGrsw//oEBKg/TTTmwLHJ5wcDgcWUGx6E4Vnqlu8bfBJqHgy7z4n/HlOnFVYI6s5KVttmi7a/afSe9T9svAlC6bKG9vq/vI5CJe6LhpQDaDAgMBAAECggEABeV7XH/37P3J4xXYwIHt9po4zVOJkYZVTAeK6cgHbIos8JfdfupGaWJRC1JrXAK/iiQ6UdziyatMptGGPg+8gfvvJtPIgKiBYk/IQRKSxVtZssJtFgon3rfHQR3MXZVh9yRGnV7HDJ9Vldj8UP1PRay1NoXrcR3rRwSzyFu1kkX1r5SEJxP9XcATXKDsmPokLQ57OO4p7ngtG6Ih3jVYZ+OK4iwJql4e65V51CDBlhcA3BGnJxb9zMQw5HemXFXsFxFNfseJeKrmdzPm84Neo4yuyiAbSIGAVMo+Dpdvf1RdZh5ciq2XbYFCv+pG/bsqWQsupu7weCASENJFsHDHoQKBgQD7YeZCjNeBPVbI+JRflFJOCMIJe4ripGTpDu+TA9jRV8Rda6/01RzbaQdOxmsW6tVUXMIEfa4DRSutWVXwUdMY94NQ9Oocjjwc6duJytByrOu6sE4Bti4VvX/J0CZDIxGEob68V0aDEywHDplrjVqsdn8Of6uFQyMqltB13K3O2wKBgQDb2ZuIUNauq4zkrSCIWqFxuYFNjWI2bqkP9lQiA0TgU3IvL7PTSKtfN2Y+ge39+qQKXb30zgKzeTCRwEHgH6WQMzhV1lbL3h0DZA7mhJ7RGp6uJzW8UOuXLfCX9JE8jiKKj1zVt6Ymu8k0eUamRvBFwp6Nis3rpNqvAGUhRGyjeQKBgQDp8vKYfPsTDEL4Rl/Pk/oFJaFvscpPoy9Gtt+/spTWPxhA2TeoY623hMeISKDhcyuWl7z48P5BjN5ZNgsE3SHY2oEbltNKQBUx03K9ikL0dnnsBKiUbzf0g6ep6k2xrbFf/ifEoHS/B9ixuKSPs73vQ1h75dV68ECKIlFfX0FigQKBgQCVtlFA+fPIDNCsZO0zjaxFOpNAEZihAqikUxWl993ueUTXtz9ZETKKa7p3tJkyDH2rBX02+RdDyrJ1fpwdmM9xLEAfzA9dU0skpP20ovlX4i3O4KqqK9zTHZiqkgRZXV1OSCRq8V33IIf68N9YmhRDHS5FqxFhd+jnpXg4uFTW2QKBgHw3dGTXXUcP8G7/LH86yreANpZLpAtzXkWrOT8BrumShp9NOCSsX46G6mmCrPxrkubvUCQI1fgs/hbdMRASrzc0lPFu5CayGLUMp+lVwnTVGTIDsFTuIExlS0UyQXhUjIjZlySB6LBLrp6WKoL4xkPz1a25hSNL/COWrXvt5+ZN
+

main/src/main/resources/application.yml

@@ -43,11 +43,11 @@ wx:
   app-id: wxc6eeeba72fd3ed01
   #app端的appId
   app-appid: wxe5251793c19a48d5
-  mch-id: 1641830577
+  mch-id: 1612358534
   api-key: a8babfa0d75ac878dd76dc905bf677e2
-  apiv3-key: 87b90c2065d9caa1c767ff1b15b21e52
-  api-serial-no: 22098B381BAE268F47FE823C70C3AA7702EE54C4
-  public-serial-no: 5BB0B8268EB289373EDFA3B1572FE3F2F8FD3B80
+  apiv3-key: IT5BZUJD6FUSYJWNQHGJ22NLELI832JE
+  api-serial-no: 7D5F2661F2E803ACBAA554D55CB03B71ABE16C76
+  public-serial-no: 5BFA109777C239CD974924938AC92304EDFAE55C
   unified-order-url: https://api.mch.weixin.qq.com/pay/unifiedorder
   notify-url: https://biketest.mofangchuxing.com/askay/notify
   refund-notify-url: https://test-crm2gw.adb-tech.com/market/client/refundNotify

main/target/classes/apiclient_key.pem

@@ -1,28 +1,2 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCthKmfULCDNE+3
-R7k5RytJM0Bsbd4Zeqe+z3A8KnOS4ddzbS0NAidc2c5vtELfSWHl+E2HBTqkD4mN
-uqoT2MKfad2YwKnJyCP+3d8oUC0ynsQXoLgBSHmyCyqbOZ+lhoQx2kIV74nRJhsI
-z5i4fjusmYK+8vEBsCoKbB/8ep5CehCdL3lCgrT7YLWSRNVOQI9hl9Sm8ACIUz+C
-Vyfp7Nvr80oCux84S4bvNN07Tabt6KSMwobcOKNO81QQ+6og2V28r14TlTtqujBt
-6uMFHXiFlanVd++wuz+x6zPhu1hYBTBGA2gZpDehAUQD+dHgWQKAWB/YCRxPocg4
-Io+/FgIFAgMBAAECggEAPHTGbL2+YlhtldwlivFjAYQb5Ct7gMEdhPvdjPj1f620
-VYEqeyfO8yjoJj9WNVnqBCg5StvljJflQz5QV83kMYq/LKOkBKv47qn7QJ5+wO5U
-QC89LSVFUWVWmPLAzvlJQd1bvSzShc6TCMTb3xwMSpzJ0yHuGrp4S11U37ERRvOR
-M0drJbK8pakdDXMfmRTaBI61AO98BMf3mvJYbbvL4u9w3Q7vHqIJDuWnMH7JNx/o
-z7Ykd4/kZJHFAMSftMww7DnZWxlmy/4sLnT44Fh/SrWgQxDRcjip6xczR/gjVZg5
-+/6IoiXIvoPlRXEgPNlSEzhSjEck70+dLMfgk9n2wQKBgQDmqEEUmVw8wGrX3qmZ
-fkT/zWOv74PfsP0TS6EA9AF3xO7GwqD8PUO5/OYYx4nOFzLgHHyFb7rcjESD1qis
-31VSayC80oGOu5apesWIz0RXRsXydGRc+raflSEpNsa/IQLocsDPyKt6QID1FFvs
-F31iG46gxyowuETjHAztEXn26QKBgQDAlT8h8NCFAb2IPgrMGaibYUBNK8ptbyNy
-vsuj4Gnhx1M3+Mcadv4eD7fiUU02NTWIWZfp59tkRljfOPulxN6AIt1LHjN4ml1O
-+cUk39d5gpAAphqV7aAJHugmtJqOhbHx2qdgxILaherixrxZ6XznFh+xG00AjSeG
-ArZvlHH4vQKBgDr0gIXyWPgSOnzopbLc6mfzqGo8rxlK1LTM3N8wfvuM83cMIje2
-tQvhzzJANkHd/hv4S/+TOlDK7WxBPqXJA7boONrqd0DzQ6QYBEteptoj9c5t34VA
-c9NAO9Sb8prBpkuhoRS69tFtkUiTJpemvV6JKqB/p5ICV2ExN0CU+faZAoGAIY4f
-qO9HtdUezA1bXkKeQSyJwqh9peG2gHjEDLK+YCuV0WvUbUUMc/pzJMjbtjVBNZe+
-w2+1p1wmggZwump6BkOM4VjKyRnEZk1Yz1r9NVvNcX9/pF36A3zSIGRZhbm/zo81
-mMPEtQSeb5MHIHdxXuZY8Uf7e7wchdoVJY3s6dUCgYEAs3Nr2HITPV88T6uWqTCu
-Y9H5iAOgh3nUKgVtEqqcDiDiZW/WOGFoiC2ERmMdAfq9pez/LifpBbGgRZgyFqDU
-KOorQk0nA6c2ycqIN57sF+v4AqdH/Kijzbjg8751/SDK3ZP3EOW6n07aVxcx4MQq
-Til1mtXx/275XG7NfFnA9Eg=
------END PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDX4m6xPrPELZrefvnCBzfaRSKLogXfYMv+Z2SWTWbEcqAAr+xgExFmN9Z5M5Ve+oBFL9Vk2zHZZd+x8CJDyXLyDC0EI19P8o/94Oc8weiJBwQFKpjO+tama9Smnz8f/+98LEzkdDCKNYSaQPP7p/Bor3cqfrU1HF+rVMfNld8aio8WEMVfj1vr9Ladc92fQSSdLDYOjx291P3bG+CNuauNdU0RFNAu6eEOUktwMLXEqiGrsw//oEBKg/TTTmwLHJ5wcDgcWUGx6E4Vnqlu8bfBJqHgy7z4n/HlOnFVYI6s5KVttmi7a/afSe9T9svAlC6bKG9vq/vI5CJe6LhpQDaDAgMBAAECggEABeV7XH/37P3J4xXYwIHt9po4zVOJkYZVTAeK6cgHbIos8JfdfupGaWJRC1JrXAK/iiQ6UdziyatMptGGPg+8gfvvJtPIgKiBYk/IQRKSxVtZssJtFgon3rfHQR3MXZVh9yRGnV7HDJ9Vldj8UP1PRay1NoXrcR3rRwSzyFu1kkX1r5SEJxP9XcATXKDsmPokLQ57OO4p7ngtG6Ih3jVYZ+OK4iwJql4e65V51CDBlhcA3BGnJxb9zMQw5HemXFXsFxFNfseJeKrmdzPm84Neo4yuyiAbSIGAVMo+Dpdvf1RdZh5ciq2XbYFCv+pG/bsqWQsupu7weCASENJFsHDHoQKBgQD7YeZCjNeBPVbI+JRflFJOCMIJe4ripGTpDu+TA9jRV8Rda6/01RzbaQdOxmsW6tVUXMIEfa4DRSutWVXwUdMY94NQ9Oocjjwc6duJytByrOu6sE4Bti4VvX/J0CZDIxGEob68V0aDEywHDplrjVqsdn8Of6uFQyMqltB13K3O2wKBgQDb2ZuIUNauq4zkrSCIWqFxuYFNjWI2bqkP9lQiA0TgU3IvL7PTSKtfN2Y+ge39+qQKXb30zgKzeTCRwEHgH6WQMzhV1lbL3h0DZA7mhJ7RGp6uJzW8UOuXLfCX9JE8jiKKj1zVt6Ymu8k0eUamRvBFwp6Nis3rpNqvAGUhRGyjeQKBgQDp8vKYfPsTDEL4Rl/Pk/oFJaFvscpPoy9Gtt+/spTWPxhA2TeoY623hMeISKDhcyuWl7z48P5BjN5ZNgsE3SHY2oEbltNKQBUx03K9ikL0dnnsBKiUbzf0g6ep6k2xrbFf/ifEoHS/B9ixuKSPs73vQ1h75dV68ECKIlFfX0FigQKBgQCVtlFA+fPIDNCsZO0zjaxFOpNAEZihAqikUxWl993ueUTXtz9ZETKKa7p3tJkyDH2rBX02+RdDyrJ1fpwdmM9xLEAfzA9dU0skpP20ovlX4i3O4KqqK9zTHZiqkgRZXV1OSCRq8V33IIf68N9YmhRDHS5FqxFhd+jnpXg4uFTW2QKBgHw3dGTXXUcP8G7/LH86yreANpZLpAtzXkWrOT8BrumShp9NOCSsX46G6mmCrPxrkubvUCQI1fgs/hbdMRASrzc0lPFu5CayGLUMp+lVwnTVGTIDsFTuIExlS0UyQXhUjIjZlySB6LBLrp6WKoL4xkPz1a25hSNL/COWrXvt5+ZN
+

main/target/classes/application.yml

@@ -43,11 +43,11 @@ wx:
   app-id: wxc6eeeba72fd3ed01
   #app端的appId
   app-appid: wxe5251793c19a48d5
-  mch-id: 1641830577
+  mch-id: 1612358534
   api-key: a8babfa0d75ac878dd76dc905bf677e2
-  apiv3-key: 87b90c2065d9caa1c767ff1b15b21e52
-  api-serial-no: 22098B381BAE268F47FE823C70C3AA7702EE54C4
-  public-serial-no: 5BB0B8268EB289373EDFA3B1572FE3F2F8FD3B80
+  apiv3-key: IT5BZUJD6FUSYJWNQHGJ22NLELI832JE
+  api-serial-no: 7D5F2661F2E803ACBAA554D55CB03B71ABE16C76
+  public-serial-no: 5BFA109777C239CD974924938AC92304EDFAE55C
   unified-order-url: https://api.mch.weixin.qq.com/pay/unifiedorder
   notify-url: https://biketest.mofangchuxing.com/askay/notify
   refund-notify-url: https://test-crm2gw.adb-tech.com/market/client/refundNotify

service/src/main/java/com/mofangchuxing/aska/service/ProfitSharingService.java

@@ -20,4 +20,8 @@ public interface ProfitSharingService {
     JSONObject queryProfit(String outOrderNo, String transactionId);
 
     void returnOrder(Integer payId, Integer refundId);
+
+    JSONObject queryLastMoney(String transactionId);
+
+    void freeze();
 }

service/src/main/java/com/mofangchuxing/aska/service/impl/ProfitSharingServiceImpl.java

@@ -1,6 +1,7 @@
 package com.mofangchuxing.aska.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.mofangchuxing.aska.dao.domain.*;
@@ -13,6 +14,7 @@ import com.mofangchuxing.aska.service.ProfitSharingService;
 import com.mofangchuxing.aska.service.utils.WxPayV3Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
@@ -23,6 +25,9 @@ import javax.crypto.IllegalBlockSizeException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @Author: syl
@@ -51,6 +56,8 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
     private PayRequestMapper payRequestMapper;
     @Resource
     private RestTemplate restTemplate;
+    @Resource
+    private FreezeMapper freezeMapper;
 
     @Override
     public void addSplitReceivers(String clientType, Long retailId, String couponNo) throws IllegalBlockSizeException, IOException {
@@ -404,4 +411,31 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         log.info("testQuery = {}", jsonObject.toJSONString());
         return jsonObject;
     }
+
+    public JSONObject queryLastMoney(String transactionId) {
+        String url = "https://api.mch.weixin.qq.com/v3/profitsharing/transactions/" + transactionId +"/amounts";
+        JSONObject jsonObject = wxPayV3Utils.getRequest(url, JSONObject.class);
+        log.info("queryLastMoney = {}", jsonObject.toJSONString());
+        return jsonObject;
+    }
+
+    @Override
+    public void freeze() {
+        List<Freeze> freezeList = freezeMapper.getAllList();
+        ThreadPoolExecutor executor = new ThreadPoolExecutor(10, 50, 60, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(200000),
+                new BasicThreadFactory.Builder().namingPattern("thread-pool-").build());
+        for (int i = 0; i < freezeList.size(); i++) {
+            Freeze freeze = freezeList.get(i);
+            executor.execute(() -> {
+                Map<String, Object> param = new HashMap<>();
+                param.put("out_order_no", "PF" + freeze.getOrderNo());
+                param.put("transaction_id", freeze.getTranId());
+                param.put("description", "解冻全部剩余资金");
+                String url = "https://api.mch.weixin.qq.com/v3/profitsharing/orders/unfreeze";
+                JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
+                log.info("freeze id = {} result = {}", freeze.getId(), jsonObject.toJSONString());
+                ThreadUtil.sleep(200);
+            });
+        }
+    }
 }

service/src/main/java/com/mofangchuxing/aska/service/impl/RetailServiceImpl.java

@@ -138,4 +138,6 @@ public class RetailServiceImpl implements RetailService {
         askaCashrequest.setRequestTime(new Date());
         askaCashrequestMapper.insertSelective(askaCashrequest);
     }
+
+
 }