fix

.idea/encodings.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-starter-parent/2.0.2.RELEASE/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/admin/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/admin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dao/src/main/java" charset="UTF-8" />
@@ -9,7 +8,5 @@
     <file url="file://$PROJECT_DIR$/main/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/main/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/service/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
 </project>

admin/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.8.6
+#Created by Apache Maven 3.6.3
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-admin

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

@@ -1,10 +1,11 @@
-com/mofangchuxing/aska/admin/Intercepter/RequestInterceptor.class
-com/mofangchuxing/aska/admin/controller/ChannelMngController.class
-com/mofangchuxing/aska/admin/controller/RetailController.class
-com/mofangchuxing/aska/admin/controller/AccountController.class
-com/mofangchuxing/aska/admin/config/WebConfig.class
-com/mofangchuxing/aska/admin/controller/ChannelController.class
-com/mofangchuxing/aska/admin/controller/SysUserController.class
-com/mofangchuxing/aska/admin/controller/AdminBaseController.class
-com/mofangchuxing/aska/admin/AdminApplication.class
-com/mofangchuxing/aska/admin/controller/RetailMngController.class
+com\mofangchuxing\aska\admin\AdminApplication.class
+com\mofangchuxing\aska\admin\controller\SysUserController.class
+com\mofangchuxing\aska\admin\controller\FinancialController.class
+com\mofangchuxing\aska\admin\controller\ChannelController.class
+com\mofangchuxing\aska\admin\controller\AdminBaseController.class
+com\mofangchuxing\aska\admin\controller\RetailMngController.class
+com\mofangchuxing\aska\admin\controller\RetailController.class
+com\mofangchuxing\aska\admin\controller\AccountController.class
+com\mofangchuxing\aska\admin\config\WebConfig.class
+com\mofangchuxing\aska\admin\Intercepter\RequestInterceptor.class
+com\mofangchuxing\aska\admin\controller\ChannelMngController.class

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

@@ -1,10 +1,11 @@
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/config/WebConfig.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/AdminApplication.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/SysUserController.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/AdminBaseController.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/Intercepter/RequestInterceptor.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelController.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/RetailController.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/RetailMngController.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelMngController.java
-/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/AccountController.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\SysUserController.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\AdminApplication.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\ChannelMngController.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\Intercepter\RequestInterceptor.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\RetailMngController.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\config\WebConfig.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\AdminBaseController.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\RetailController.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\AccountController.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\ChannelController.java
+H:\work\aska\admin\src\main\java\com\mofangchuxing\aska\admin\controller\FinancialController.java

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

@@ -105,22 +105,24 @@ public class AskaRetails implements Serializable {
     /**
      * 收入总额
      */
-    private Integer totalIncome;
+    private Integer accountingIncome;
 
     /**
      * 实时分账总 额
      */
-    private Integer totalSplit;
+    private Integer splitIncome;
 
     /**
      * 提现总额
      */
-    private Integer totalCashOut;
+    private Integer accountingRefund;
 
     /**
      * 退款总额
      */
-    private Integer totalRefund;
+    private Integer splitRefund;
+
+    private Integer cashOut;
 
     /**
      * 余额
@@ -395,60 +397,44 @@ public class AskaRetails implements Serializable {
         this.status = status;
     }
 
-    /**
-     * 收入总额
-     */
-    public Integer getTotalIncome() {
-        return totalIncome;
+    public Integer getAccountingIncome() {
+        return accountingIncome;
     }
 
-    /**
-     * 收入总额
-     */
-    public void setTotalIncome(Integer totalIncome) {
-        this.totalIncome = totalIncome;
+    public void setAccountingIncome(Integer accountingIncome) {
+        this.accountingIncome = accountingIncome;
     }
 
-    /**
-     * 实时分账总 额
-     */
-    public Integer getTotalSplit() {
-        return totalSplit;
+    public Integer getSplitIncome() {
+        return splitIncome;
     }
 
-    /**
-     * 实时分账总 额
-     */
-    public void setTotalSplit(Integer totalSplit) {
-        this.totalSplit = totalSplit;
+    public void setSplitIncome(Integer splitIncome) {
+        this.splitIncome = splitIncome;
     }
 
-    /**
-     * 提现总额
-     */
-    public Integer getTotalCashOut() {
-        return totalCashOut;
+    public Integer getAccountingRefund() {
+        return accountingRefund;
     }
 
-    /**
-     * 提现总额
-     */
-    public void setTotalCashOut(Integer totalCashOut) {
-        this.totalCashOut = totalCashOut;
+    public void setAccountingRefund(Integer accountingRefund) {
+        this.accountingRefund = accountingRefund;
     }
 
-    /**
-     * 退款总额
-     */
-    public Integer getTotalRefund() {
-        return totalRefund;
+    public Integer getSplitRefund() {
+        return splitRefund;
     }
 
-    /**
-     * 退款总额
-     */
-    public void setTotalRefund(Integer totalRefund) {
-        this.totalRefund = totalRefund;
+    public void setSplitRefund(Integer splitRefund) {
+        this.splitRefund = splitRefund;
+    }
+
+    public Integer getCashOut() {
+        return cashOut;
+    }
+
+    public void setCashOut(Integer cashOut) {
+        this.cashOut = cashOut;
     }
 
     /**
@@ -496,10 +482,6 @@ public class AskaRetails implements Serializable {
             && (this.getTripvalue() == null ? other.getTripvalue() == null : this.getTripvalue().equals(other.getTripvalue()))
             && (this.getRealtimeSplit() == null ? other.getRealtimeSplit() == null : this.getRealtimeSplit().equals(other.getRealtimeSplit()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getTotalIncome() == null ? other.getTotalIncome() == null : this.getTotalIncome().equals(other.getTotalIncome()))
-            && (this.getTotalSplit() == null ? other.getTotalSplit() == null : this.getTotalSplit().equals(other.getTotalSplit()))
-            && (this.getTotalCashOut() == null ? other.getTotalCashOut() == null : this.getTotalCashOut().equals(other.getTotalCashOut()))
-            && (this.getTotalRefund() == null ? other.getTotalRefund() == null : this.getTotalRefund().equals(other.getTotalRefund()))
             && (this.getBalance() == null ? other.getBalance() == null : this.getBalance().equals(other.getBalance()));
     }
 
@@ -526,10 +508,6 @@ public class AskaRetails implements Serializable {
         result = prime * result + ((getTripvalue() == null) ? 0 : getTripvalue().hashCode());
         result = prime * result + ((getRealtimeSplit() == null) ? 0 : getRealtimeSplit().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getTotalIncome() == null) ? 0 : getTotalIncome().hashCode());
-        result = prime * result + ((getTotalSplit() == null) ? 0 : getTotalSplit().hashCode());
-        result = prime * result + ((getTotalCashOut() == null) ? 0 : getTotalCashOut().hashCode());
-        result = prime * result + ((getTotalRefund() == null) ? 0 : getTotalRefund().hashCode());
         result = prime * result + ((getBalance() == null) ? 0 : getBalance().hashCode());
         return result;
     }
@@ -559,10 +537,6 @@ public class AskaRetails implements Serializable {
         sb.append(", tripvalue=").append(tripvalue);
         sb.append(", realtimeSplit=").append(realtimeSplit);
         sb.append(", status=").append(status);
-        sb.append(", totalIncome=").append(totalIncome);
-        sb.append(", totalSplit=").append(totalSplit);
-        sb.append(", totalCashOut=").append(totalCashOut);
-        sb.append(", totalRefund=").append(totalRefund);
         sb.append(", balance=").append(balance);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");

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

@@ -24,10 +24,11 @@
             <result property="tripvalue" column="tripvalue" jdbcType="INTEGER"/>
             <result property="realtimeSplit" column="realtimeSplit" jdbcType="INTEGER"/>
             <result property="status" column="status" jdbcType="CHAR"/>
-            <result property="totalIncome" column="totalIncome" jdbcType="INTEGER"/>
-            <result property="totalSplit" column="totalSplit" jdbcType="INTEGER"/>
-            <result property="totalCashOut" column="totalCashOut" jdbcType="INTEGER"/>
-            <result property="totalRefund" column="totalRefund" jdbcType="INTEGER"/>
+            <result property="accountingIncome" column="accountingIncome" jdbcType="INTEGER"/>
+            <result property="splitIncome" column="splitIncome" jdbcType="INTEGER"/>
+            <result property="accountingRefund" column="accountingRefund" jdbcType="INTEGER"/>
+            <result property="splitRefund" column="splitRefund" jdbcType="INTEGER"/>
+            <result property="cashOut" column="cashOut" jdbcType="INTEGER"/>
             <result property="balance" column="balance" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -38,8 +39,8 @@
         account,accountName,accountType,
         relation,apiv3,certPath,
         tripartite,tripvalue,realtimeSplit,
-        status,totalIncome,totalSplit,
-        totalCashOut,totalRefund,balance
+        status,accountingIncome,splitIncome,
+        accountingRefund,splitRefund,cashOut,balance
     </sql>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -86,8 +87,8 @@
         ,account,accountName,accountType
         ,relation,apiv3,certPath
         ,tripartite,tripvalue,realtimeSplit
-        ,status,totalIncome,totalSplit
-        ,totalCashOut,totalRefund,balance
+        ,status,accountingIncome,splitIncome
+        ,accountingRefund,splitRefund,cashOut,balance
         )
         values (#{id,jdbcType=INTEGER},#{name,jdbcType=CHAR},#{address,jdbcType=VARCHAR}
         ,#{type,jdbcType=CHAR},#{lat,jdbcType=DOUBLE},#{lng,jdbcType=DOUBLE}
@@ -95,8 +96,8 @@
         ,#{account,jdbcType=VARCHAR},#{accountName,jdbcType=VARCHAR},#{accountType,jdbcType=CHAR}
         ,#{relation,jdbcType=CHAR},#{apiv3,jdbcType=VARCHAR},#{certPath,jdbcType=VARCHAR}
         ,#{tripartite,jdbcType=CHAR},#{tripvalue,jdbcType=INTEGER},#{realtimeSplit,jdbcType=INTEGER}
-        ,#{status,jdbcType=CHAR},#{totalIncome,jdbcType=INTEGER},#{totalSplit,jdbcType=INTEGER}
-        ,#{totalCashOut,jdbcType=INTEGER},#{totalRefund,jdbcType=INTEGER},#{balance,jdbcType=INTEGER}
+        ,#{status,jdbcType=CHAR},#{accountingIncome,jdbcType=INTEGER},#{splitIncome,jdbcType=INTEGER}
+        ,#{accountingRefund,jdbcType=INTEGER},#{splitRefund,jdbcType=INTEGER},#{cashOut,jdbcType=INTEGER},#{balance,jdbcType=INTEGER}
         )
     </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaRetails" useGeneratedKeys="true">
@@ -121,10 +122,6 @@
                 <if test="tripvalue != null">tripvalue,</if>
                 <if test="realtimeSplit != null">realtimeSplit,</if>
                 <if test="status != null">status,</if>
-                <if test="totalIncome != null">totalIncome,</if>
-                <if test="totalSplit != null">totalSplit,</if>
-                <if test="totalCashOut != null">totalCashOut,</if>
-                <if test="totalRefund != null">totalRefund,</if>
                 <if test="balance != null">balance,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -147,10 +144,6 @@
                 <if test="tripvalue != null">#{tripvalue,jdbcType=INTEGER},</if>
                 <if test="realtimeSplit != null">#{realtimeSplit,jdbcType=INTEGER},</if>
                 <if test="status != null">#{status,jdbcType=CHAR},</if>
-                <if test="totalIncome != null">#{totalIncome,jdbcType=INTEGER},</if>
-                <if test="totalSplit != null">#{totalSplit,jdbcType=INTEGER},</if>
-                <if test="totalCashOut != null">#{totalCashOut,jdbcType=INTEGER},</if>
-                <if test="totalRefund != null">#{totalRefund,jdbcType=INTEGER},</if>
                 <if test="balance != null">#{balance,jdbcType=INTEGER},</if>
         </trim>
     </insert>
@@ -211,17 +204,20 @@
                 <if test="status != null">
                     status = #{status,jdbcType=CHAR},
                 </if>
-                <if test="totalIncome != null">
-                    totalIncome = #{totalIncome,jdbcType=INTEGER},
+                <if test="accountingIncome != null">
+                    accountingIncome = #{accountingIncome,jdbcType=INTEGER},
                 </if>
-                <if test="totalSplit != null">
-                    totalSplit = #{totalSplit,jdbcType=INTEGER},
+                <if test="splitIncome != null">
+                    splitIncome = #{splitIncome,jdbcType=INTEGER},
                 </if>
-                <if test="totalCashOut != null">
-                    totalCashOut = #{totalCashOut,jdbcType=INTEGER},
+                <if test="accountingRefund != null">
+                    accountingRefund = #{accountingRefund,jdbcType=INTEGER},
                 </if>
-                <if test="totalRefund != null">
-                    totalRefund = #{totalRefund,jdbcType=INTEGER},
+                <if test="splitRefund != null">
+                    splitRefund = #{splitRefund,jdbcType=INTEGER},
+                </if>
+                <if test="cashOut != null">
+                    cashOut = #{cashOut,jdbcType=INTEGER},
                 </if>
                 <if test="balance != null">
                     balance = #{balance,jdbcType=INTEGER},
@@ -250,10 +246,11 @@
             tripvalue =  #{tripvalue,jdbcType=INTEGER},
             realtimeSplit =  #{realtimeSplit,jdbcType=INTEGER},
             status =  #{status,jdbcType=CHAR},
-            totalIncome =  #{totalIncome,jdbcType=INTEGER},
-            totalSplit =  #{totalSplit,jdbcType=INTEGER},
-            totalCashOut =  #{totalCashOut,jdbcType=INTEGER},
-            totalRefund =  #{totalRefund,jdbcType=INTEGER},
+            accountingIncome =  #{accountingIncome,jdbcType=INTEGER},
+            splitIncome =  #{splitIncome,jdbcType=INTEGER},
+            accountingRefund =  #{accountingRefund,jdbcType=INTEGER},
+            splitRefund =  #{splitRefund,jdbcType=INTEGER},
+            cashOut =  #{cashOut,jdbcType=INTEGER},
             balance =  #{balance,jdbcType=INTEGER}
         where   id = #{id,jdbcType=INTEGER} 
     </update>

dao/target/classes/mapper/AskaRetailsMapper.xml

@@ -24,10 +24,11 @@
             <result property="tripvalue" column="tripvalue" jdbcType="INTEGER"/>
             <result property="realtimeSplit" column="realtimeSplit" jdbcType="INTEGER"/>
             <result property="status" column="status" jdbcType="CHAR"/>
-            <result property="totalIncome" column="totalIncome" jdbcType="INTEGER"/>
-            <result property="totalSplit" column="totalSplit" jdbcType="INTEGER"/>
-            <result property="totalCashOut" column="totalCashOut" jdbcType="INTEGER"/>
-            <result property="totalRefund" column="totalRefund" jdbcType="INTEGER"/>
+            <result property="accountingIncome" column="accountingIncome" jdbcType="INTEGER"/>
+            <result property="splitIncome" column="splitIncome" jdbcType="INTEGER"/>
+            <result property="accountingRefund" column="accountingRefund" jdbcType="INTEGER"/>
+            <result property="splitRefund" column="splitRefund" jdbcType="INTEGER"/>
+            <result property="cashOut" column="cashOut" jdbcType="INTEGER"/>
             <result property="balance" column="balance" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -38,8 +39,8 @@
         account,accountName,accountType,
         relation,apiv3,certPath,
         tripartite,tripvalue,realtimeSplit,
-        status,totalIncome,totalSplit,
-        totalCashOut,totalRefund,balance
+        status,accountingIncome,splitIncome,
+        accountingRefund,splitRefund,cashOut,balance
     </sql>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -86,8 +87,8 @@
         ,account,accountName,accountType
         ,relation,apiv3,certPath
         ,tripartite,tripvalue,realtimeSplit
-        ,status,totalIncome,totalSplit
-        ,totalCashOut,totalRefund,balance
+        ,status,accountingIncome,splitIncome
+        ,accountingRefund,splitRefund,cashOut,balance
         )
         values (#{id,jdbcType=INTEGER},#{name,jdbcType=CHAR},#{address,jdbcType=VARCHAR}
         ,#{type,jdbcType=CHAR},#{lat,jdbcType=DOUBLE},#{lng,jdbcType=DOUBLE}
@@ -95,8 +96,8 @@
         ,#{account,jdbcType=VARCHAR},#{accountName,jdbcType=VARCHAR},#{accountType,jdbcType=CHAR}
         ,#{relation,jdbcType=CHAR},#{apiv3,jdbcType=VARCHAR},#{certPath,jdbcType=VARCHAR}
         ,#{tripartite,jdbcType=CHAR},#{tripvalue,jdbcType=INTEGER},#{realtimeSplit,jdbcType=INTEGER}
-        ,#{status,jdbcType=CHAR},#{totalIncome,jdbcType=INTEGER},#{totalSplit,jdbcType=INTEGER}
-        ,#{totalCashOut,jdbcType=INTEGER},#{totalRefund,jdbcType=INTEGER},#{balance,jdbcType=INTEGER}
+        ,#{status,jdbcType=CHAR},#{accountingIncome,jdbcType=INTEGER},#{splitIncome,jdbcType=INTEGER}
+        ,#{accountingRefund,jdbcType=INTEGER},#{splitRefund,jdbcType=INTEGER},#{cashOut,jdbcType=INTEGER},#{balance,jdbcType=INTEGER}
         )
     </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaRetails" useGeneratedKeys="true">
@@ -121,10 +122,6 @@
                 <if test="tripvalue != null">tripvalue,</if>
                 <if test="realtimeSplit != null">realtimeSplit,</if>
                 <if test="status != null">status,</if>
-                <if test="totalIncome != null">totalIncome,</if>
-                <if test="totalSplit != null">totalSplit,</if>
-                <if test="totalCashOut != null">totalCashOut,</if>
-                <if test="totalRefund != null">totalRefund,</if>
                 <if test="balance != null">balance,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -147,10 +144,6 @@
                 <if test="tripvalue != null">#{tripvalue,jdbcType=INTEGER},</if>
                 <if test="realtimeSplit != null">#{realtimeSplit,jdbcType=INTEGER},</if>
                 <if test="status != null">#{status,jdbcType=CHAR},</if>
-                <if test="totalIncome != null">#{totalIncome,jdbcType=INTEGER},</if>
-                <if test="totalSplit != null">#{totalSplit,jdbcType=INTEGER},</if>
-                <if test="totalCashOut != null">#{totalCashOut,jdbcType=INTEGER},</if>
-                <if test="totalRefund != null">#{totalRefund,jdbcType=INTEGER},</if>
                 <if test="balance != null">#{balance,jdbcType=INTEGER},</if>
         </trim>
     </insert>
@@ -211,17 +204,20 @@
                 <if test="status != null">
                     status = #{status,jdbcType=CHAR},
                 </if>
-                <if test="totalIncome != null">
-                    totalIncome = #{totalIncome,jdbcType=INTEGER},
+                <if test="accountingIncome != null">
+                    accountingIncome = #{accountingIncome,jdbcType=INTEGER},
                 </if>
-                <if test="totalSplit != null">
-                    totalSplit = #{totalSplit,jdbcType=INTEGER},
+                <if test="splitIncome != null">
+                    splitIncome = #{splitIncome,jdbcType=INTEGER},
                 </if>
-                <if test="totalCashOut != null">
-                    totalCashOut = #{totalCashOut,jdbcType=INTEGER},
+                <if test="accountingRefund != null">
+                    accountingRefund = #{accountingRefund,jdbcType=INTEGER},
                 </if>
-                <if test="totalRefund != null">
-                    totalRefund = #{totalRefund,jdbcType=INTEGER},
+                <if test="splitRefund != null">
+                    splitRefund = #{splitRefund,jdbcType=INTEGER},
+                </if>
+                <if test="cashOut != null">
+                    cashOut = #{cashOut,jdbcType=INTEGER},
                 </if>
                 <if test="balance != null">
                     balance = #{balance,jdbcType=INTEGER},
@@ -250,10 +246,11 @@
             tripvalue =  #{tripvalue,jdbcType=INTEGER},
             realtimeSplit =  #{realtimeSplit,jdbcType=INTEGER},
             status =  #{status,jdbcType=CHAR},
-            totalIncome =  #{totalIncome,jdbcType=INTEGER},
-            totalSplit =  #{totalSplit,jdbcType=INTEGER},
-            totalCashOut =  #{totalCashOut,jdbcType=INTEGER},
-            totalRefund =  #{totalRefund,jdbcType=INTEGER},
+            accountingIncome =  #{accountingIncome,jdbcType=INTEGER},
+            splitIncome =  #{splitIncome,jdbcType=INTEGER},
+            accountingRefund =  #{accountingRefund,jdbcType=INTEGER},
+            splitRefund =  #{splitRefund,jdbcType=INTEGER},
+            cashOut =  #{cashOut,jdbcType=INTEGER},
             balance =  #{balance,jdbcType=INTEGER}
         where   id = #{id,jdbcType=INTEGER} 
     </update>

dao/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.8.6
+#Created by Apache Maven 3.6.3
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-dao

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

@@ -1,19 +1,23 @@
-com/mofangchuxing/aska/dao/mapper/SysMenuMapper.class
-com/mofangchuxing/aska/dao/domain/NotifyRecord.class
-com/mofangchuxing/aska/dao/mapper/AskaAccountsMapper.class
-com/mofangchuxing/aska/dao/domain/AskaRetails.class
-com/mofangchuxing/aska/dao/mapper/NotifyRecordMapper.class
-com/mofangchuxing/aska/dao/domain/AskaAccounts.class
-com/mofangchuxing/aska/dao/mapper/PayRequestMapper.class
-com/mofangchuxing/aska/dao/domain/PayRequest.class
-com/mofangchuxing/aska/dao/mapper/AskaRetailsMapper.class
-com/mofangchuxing/aska/dao/domain/RefundOrder.class
-com/mofangchuxing/aska/dao/domain/AskaChannels.class
-com/mofangchuxing/aska/dao/config/SqlConfig.class
-com/mofangchuxing/aska/dao/mapper/AskaSplitrecordMapper.class
-com/mofangchuxing/aska/dao/domain/AskaSplitrecord.class
-com/mofangchuxing/aska/dao/mapper/RefundOrderMapper.class
-com/mofangchuxing/aska/dao/mapper/AskaChannelcouponnosMapper.class
-com/mofangchuxing/aska/dao/domain/SysMenu.class
-com/mofangchuxing/aska/dao/mapper/AskaChannelsMapper.class
-com/mofangchuxing/aska/dao/domain/AskaChannelcouponnos.class
+com\mofangchuxing\aska\dao\domain\AskaChannels.class
+com\mofangchuxing\aska\dao\mapper\AskaCashrequestMapper.class
+com\mofangchuxing\aska\dao\config\SqlConfig.class
+com\mofangchuxing\aska\dao\mapper\AskaSplitrecordMapper.class
+com\mofangchuxing\aska\dao\domain\AskaSplitrecord.class
+com\mofangchuxing\aska\dao\domain\AskaChannelnos.class
+com\mofangchuxing\aska\dao\domain\AskaChannelcouponnos.class
+com\mofangchuxing\aska\dao\mapper\AskaRetailsMapper.class
+com\mofangchuxing\aska\dao\mapper\AskaChannelcouponnosMapper.class
+com\mofangchuxing\aska\dao\mapper\RefundOrderMapper.class
+com\mofangchuxing\aska\dao\mapper\NotifyRecordMapper.class
+com\mofangchuxing\aska\dao\domain\AskaCashrequest.class
+com\mofangchuxing\aska\dao\domain\AskaAccounts.class
+com\mofangchuxing\aska\dao\mapper\PayRequestMapper.class
+com\mofangchuxing\aska\dao\mapper\SysMenuMapper.class
+com\mofangchuxing\aska\dao\domain\PayRequest.class
+com\mofangchuxing\aska\dao\domain\SysMenu.class
+com\mofangchuxing\aska\dao\mapper\AskaAccountsMapper.class
+com\mofangchuxing\aska\dao\mapper\AskaChannelnosMapper.class
+com\mofangchuxing\aska\dao\domain\RefundOrder.class
+com\mofangchuxing\aska\dao\domain\NotifyRecord.class
+com\mofangchuxing\aska\dao\domain\AskaRetails.class
+com\mofangchuxing\aska\dao\mapper\AskaChannelsMapper.class

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

@@ -1,19 +1,23 @@
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/config/SqlConfig.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/SysMenuMapper.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/SysMenu.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/mapper/AskaSplitrecordMapper.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaAccountsMapper.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaRetailsMapper.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/RefundOrder.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/NotifyRecord.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaChannelcouponnosMapper.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaRetails.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaChannels.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaAccounts.java
-/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/RefundOrderMapper.java
-/Users/syl/Desktop/work/aska/dao/src/main/java/com/mofangchuxing/aska/dao/mapper/NotifyRecordMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaChannelsMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\PayRequestMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaCashrequest.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\NotifyRecord.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\PayRequest.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\NotifyRecordMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\config\SqlConfig.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaChannelnosMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaRetailsMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\RefundOrder.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\SysMenu.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaAccountsMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaSplitrecord.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaChannelcouponnosMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaChannelnos.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaSplitrecordMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\RefundOrderMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\AskaCashrequestMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaChannelcouponnos.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaChannels.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\mapper\SysMenuMapper.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaAccounts.java
+H:\work\aska\dao\src\main\java\com\mofangchuxing\aska\dao\domain\AskaRetails.java

domain/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.8.6
+#Created by Apache Maven 3.6.3
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-domain

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

@@ -1,29 +1,31 @@
-com/mofangchuxing/aska/domain/dto/BaseDto.class
-com/mofangchuxing/aska/domain/dto/RetailDto.class
-com/mofangchuxing/aska/domain/entity/SysMenuEntity.class
-com/mofangchuxing/aska/domain/utils/PageUtils.class
-com/mofangchuxing/aska/domain/dto/LoginDto.class
-com/mofangchuxing/aska/domain/ResponseResult.class
-com/mofangchuxing/aska/domain/enums/PayStatusEnum.class
-com/mofangchuxing/aska/domain/vo/AskaChannelsVo.class
-com/mofangchuxing/aska/domain/Constant$MenuType.class
-com/mofangchuxing/aska/domain/vo/PayRequestVo.class
-com/mofangchuxing/aska/domain/dto/AccountDto.class
-com/mofangchuxing/aska/domain/entity/SysMenuEntity$SysMenuEntityBuilder.class
-com/mofangchuxing/aska/domain/dto/ChannelDto.class
-com/mofangchuxing/aska/domain/vo/WeiXinPayScoreServiceResourceDTO.class
-com/mofangchuxing/aska/domain/enums/ResultEnum.class
-com/mofangchuxing/aska/domain/DelayObjectWrapper.class
-com/mofangchuxing/aska/domain/R.class
-com/mofangchuxing/aska/domain/dto/WeiXinPayScoreServiceResourceDTO.class
-com/mofangchuxing/aska/domain/dto/OrderDto.class
-com/mofangchuxing/aska/domain/enums/ClientTypeEnum.class
-com/mofangchuxing/aska/domain/enums/RecordTypeEnum.class
-com/mofangchuxing/aska/domain/vo/AskaRetailsVo.class
-com/mofangchuxing/aska/domain/enums/ItemTypeEnum.class
-com/mofangchuxing/aska/domain/enums/DelayTypeEnum.class
-com/mofangchuxing/aska/domain/PayRequestDto.class
-com/mofangchuxing/aska/domain/vo/WeiXinPlatformCredentialVO.class
-com/mofangchuxing/aska/domain/Constant.class
-com/mofangchuxing/aska/domain/entity/PlainCertificateItem.class
-com/mofangchuxing/aska/domain/BizException.class
+com\mofangchuxing\aska\domain\R.class
+com\mofangchuxing\aska\domain\enums\PayStatusEnum.class
+com\mofangchuxing\aska\domain\vo\WeiXinPayScoreServiceResourceDTO.class
+com\mofangchuxing\aska\domain\dto\AccountDto.class
+com\mofangchuxing\aska\domain\enums\RecordTypeEnum.class
+com\mofangchuxing\aska\domain\dto\ChannelCouponDto.class
+com\mofangchuxing\aska\domain\vo\AskaRetailsVo.class
+com\mofangchuxing\aska\domain\dto\BaseDto.class
+com\mofangchuxing\aska\domain\vo\AskaChannelsVo.class
+com\mofangchuxing\aska\domain\dto\WeiXinPayScoreServiceResourceDTO.class
+com\mofangchuxing\aska\domain\dto\LoginDto.class
+com\mofangchuxing\aska\domain\entity\PlainCertificateItem.class
+com\mofangchuxing\aska\domain\enums\DelayTypeEnum.class
+com\mofangchuxing\aska\domain\dto\ChannelNoDto.class
+com\mofangchuxing\aska\domain\dto\RetailDto.class
+com\mofangchuxing\aska\domain\enums\ClientTypeEnum.class
+com\mofangchuxing\aska\domain\PayRequestDto.class
+com\mofangchuxing\aska\domain\ResponseResult.class
+com\mofangchuxing\aska\domain\dto\OrderDto.class
+com\mofangchuxing\aska\domain\vo\WeiXinPlatformCredentialVO.class
+com\mofangchuxing\aska\domain\entity\SysMenuEntity$SysMenuEntityBuilder.class
+com\mofangchuxing\aska\domain\dto\ChannelDto.class
+com\mofangchuxing\aska\domain\BizException.class
+com\mofangchuxing\aska\domain\Constant$MenuType.class
+com\mofangchuxing\aska\domain\enums\ResultEnum.class
+com\mofangchuxing\aska\domain\Constant.class
+com\mofangchuxing\aska\domain\utils\PageUtils.class
+com\mofangchuxing\aska\domain\enums\ItemTypeEnum.class
+com\mofangchuxing\aska\domain\entity\SysMenuEntity.class
+com\mofangchuxing\aska\domain\vo\PayRequestVo.class
+com\mofangchuxing\aska\domain\DelayObjectWrapper.class

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

@@ -1,27 +1,29 @@
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/OrderDto.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/PayStatusEnum.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/R.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/WeiXinPayScoreServiceResourceDTO.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/PayRequestVo.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ResultEnum.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/PayRequestDto.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/AskaChannelsVo.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/entity/PlainCertificateItem.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/entity/SysMenuEntity.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/RecordTypeEnum.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/ResponseResult.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/DelayTypeEnum.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/WeiXinPayScoreServiceResourceDTO.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/DelayObjectWrapper.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/BizException.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/Constant.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/AccountDto.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ClientTypeEnum.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/BaseDto.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/AskaRetailsVo.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/WeiXinPlatformCredentialVO.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/RetailDto.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/utils/PageUtils.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ItemTypeEnum.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelDto.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/LoginDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\ChannelNoDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\ChannelCouponDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\WeiXinPayScoreServiceResourceDTO.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\WeiXinPlatformCredentialVO.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\RetailDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\LoginDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\ResultEnum.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\ResponseResult.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\entity\PlainCertificateItem.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\R.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\BaseDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\PayRequestDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\DelayTypeEnum.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\PayRequestVo.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\PayStatusEnum.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\OrderDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\AccountDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\DelayObjectWrapper.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\WeiXinPayScoreServiceResourceDTO.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\utils\PageUtils.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\BizException.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\Constant.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\ItemTypeEnum.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\entity\SysMenuEntity.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\dto\ChannelDto.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\ClientTypeEnum.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\AskaChannelsVo.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\enums\RecordTypeEnum.java
+H:\work\aska\domain\src\main\java\com\mofangchuxing\aska\domain\vo\AskaRetailsVo.java

main/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.8.6
+#Created by Apache Maven 3.6.3
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-main

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

@@ -1,6 +1,6 @@
-com/mofangchuxing/aska/handler/GlobalExceptionHandler.class
-com/mofangchuxing/aska/config/WebConfig.class
-com/mofangchuxing/aska/Interceptor/RequestInterceptor.class
-com/mofangchuxing/aska/Application.class
-com/mofangchuxing/aska/controller/AskaController.class
-com/mofangchuxing/aska/ApplicationRunner.class
+com\mofangchuxing\aska\handler\GlobalExceptionHandler.class
+com\mofangchuxing\aska\Interceptor\RequestInterceptor.class
+com\mofangchuxing\aska\Application.class
+com\mofangchuxing\aska\ApplicationRunner.class
+com\mofangchuxing\aska\config\WebConfig.class
+com\mofangchuxing\aska\controller\AskaController.class

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

@@ -1,6 +1,6 @@
-/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/handler/GlobalExceptionHandler.java
-/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/Interceptor/RequestInterceptor.java
-/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/controller/AskaController.java
-/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/Application.java
-/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/ApplicationRunner.java
-/Users/syl/Desktop/work/aska/main/src/main/java/com/mofangchuxing/aska/config/WebConfig.java
+H:\work\aska\main\src\main\java\com\mofangchuxing\aska\ApplicationRunner.java
+H:\work\aska\main\src\main\java\com\mofangchuxing\aska\handler\GlobalExceptionHandler.java
+H:\work\aska\main\src\main\java\com\mofangchuxing\aska\Interceptor\RequestInterceptor.java
+H:\work\aska\main\src\main\java\com\mofangchuxing\aska\config\WebConfig.java
+H:\work\aska\main\src\main\java\com\mofangchuxing\aska\controller\AskaController.java
+H:\work\aska\main\src\main\java\com\mofangchuxing\aska\Application.java

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

@@ -237,7 +237,7 @@ public class PayServiceImpl implements PayService {
                         try {
                             profitSharingService.addSplitReceivers(payRequest.getClientType(), Long.parseLong(payRequest.getRetailId()), payRequest.getUseCouponId());
                             delayNotifyComponent.delay(payRequest.getOrderSn(), DelayTypeEnum.TYPE_SPLIT, 2, TimeUnit.MINUTES);
-                        } catch (IllegalBlockSizeException e) {
+                        } catch (Exception e) {
                             e.printStackTrace();
                         }
                     }

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

@@ -89,8 +89,12 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         param.put("account", mchId);
         param.put("relation_type", "CUSTOM");
         param.put("custom_relation", "加盟商");
-        JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
-        log.info("测试添加分账 result = {}", jsonObject.toJSONString());
+        try {
+            JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
+            log.info("测试添加分账 result = {}", jsonObject.toJSONString());
+        }catch (Exception e){
+
+        }
     }
 
     @Override
@@ -117,6 +121,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         // 从门店读取配置 计算需要分账的金额
         AskaRetails askaRetails = askaRetailsMapper.selectByPrimaryKey(retailId);
         Integer retailAmount = 0;
+        boolean retailRealtimeSplit = true;
         Map<String, Object> retailReceiver = new HashMap<>();
         if (askaRetails != null) {
             retailReceiver = getReceiverMap(askaRetails.getAccountType(),
@@ -126,13 +131,19 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
             retailAmount = Integer.parseInt(retailReceiver.get("amount").toString());
             askaSplitrecord.setRetailAccount(askaRetails.getAccount());
             askaSplitrecord.setRetailAmount(retailAmount.toString());
+            if (askaRetails.getRealtimeSplit() == 0) {
+                askaSplitrecord.setRetailRealtimeAmount(0);
+                askaSplitrecord.setRetailAccountAmount(retailAmount);
+                retailRealtimeSplit = false;
+            }
             askaSplitrecord.setRetailSplitrule("tripartite = " + askaRetails.getTripartite()+ ", tripvalue = "+askaRetails.getTripvalue());
         }
         // 如果使用礼券 根据礼券查询渠道 计算需要分账的金额
         AskaChannelcouponnos askaChannelcouponnos = askaChannelcouponnosMapper.searchAllByCouponNo(couponNo);
         Integer channelAmount = 0;
+        boolean channelRealtimeSplit = true;
         Map<String, Object> channelReceiver = new HashMap<>();
-        if (askaChannelcouponnos != null){
+        if (askaChannelcouponnos != null) {
             AskaChannels askaChannels = askaChannelsMapper.selectByPrimaryKey(askaChannelcouponnos.getChannelId().longValue());
             channelReceiver = getReceiverMap(askaChannels.getAccountType(),
                     askaChannels.getAccount(),askaChannels.getTripartite(), payMoney, askaChannels.getTripvalue(), askaChannels.getAccountName(), "分账给渠道-"+askaChannels.getName());
@@ -141,10 +152,23 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
             channelAmount = Integer.parseInt(channelReceiver.get("amount").toString());
             askaSplitrecord.setChannelAccount(askaChannels.getAccount());
             askaSplitrecord.setChannelAmount(channelAmount.toString());
+            if (askaChannels.getRealtimeSplit() == 0) {
+                askaSplitrecord.setChannelRealtimeAmount(0);
+                askaSplitrecord.setChannelAccountAmount(channelAmount);
+                channelRealtimeSplit = false;
+            }
             askaSplitrecord.setChannelSplitRule("tripartite = " + askaChannels.getTripartite()+ ", tripvalue = "+askaChannels.getTripvalue());
         }
         // 计算门店和渠道最大可分账金额 剩下的记账
-        askaSplitrecord = calculateRecord(askaSplitrecord, maxValue, retailAmount, channelAmount);
+        AskaSplitrecord record = calculateRecord(maxValue, retailAmount, channelAmount);
+        if (retailRealtimeSplit) {
+            askaSplitrecord.setRetailRealtimeAmount(record.getRetailRealtimeAmount());
+            askaSplitrecord.setRetailAccountAmount(record.getRetailAccountAmount());
+        }
+        if (channelRealtimeSplit) {
+            askaSplitrecord.setChannelRealtimeAmount(record.getChannelRealtimeAmount());
+            askaSplitrecord.setChannelAccountAmount(record.getChannelAccountAmount());
+        }
         if (askaSplitrecord.getRetailRealtimeAmount() > 0) {
             retailReceiver.put("amount", askaSplitrecord.getRetailRealtimeAmount());
             receivers.add(retailReceiver);
@@ -158,17 +182,19 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         askaSplitrecord.setStatus(1);
         askaSplitrecord.setCreateTime(new Date());
         askaSplitrecordMapper.insertSelective(askaSplitrecord);
-        try {
-            JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
-            log.info("测试分账 result = {}", jsonObject.toJSONString());
-            if ("PROCESSING".equals(jsonObject.getString("state")) || "FINISHED".equals(jsonObject.getString("state"))) {
-                //分账成功
-            }else {
+        if (receivers.size() > 0) {
+            try {
+                JSONObject jsonObject = wxPayV3Utils.postRequest(url, JSONUtil.toJsonStr(param), JSONObject.class);
+                log.info("测试分账 result = {}", jsonObject.toJSONString());
+                if ("PROCESSING".equals(jsonObject.getString("state")) || "FINISHED".equals(jsonObject.getString("state"))) {
+                    //分账成功
+                }else {
+                    handleSplitFailed(askaSplitrecord);
+                }
+            } catch (Exception e) {
+                log.info("测试分账 exception = {}", e.getMessage());
                 handleSplitFailed(askaSplitrecord);
             }
-        } catch (Exception e) {
-            log.info("测试分账 exception = {}", e.getMessage());
-            handleSplitFailed(askaSplitrecord);
         }
         notifyAmountChange(askaSplitrecord.getPayId());
     }
@@ -194,6 +220,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         updateSplitrecord.setRetailAccountAmount(askaSplitrecord.getRetailAccountAmount() + askaSplitrecord.getRetailRealtimeAmount());
         updateSplitrecord.setChannelRealtimeAmount(0);
         updateSplitrecord.setChannelAccountAmount(askaSplitrecord.getChannelAccountAmount() + askaSplitrecord.getRetailRealtimeAmount());
+        askaSplitrecordMapper.updateByPrimaryKeySelective(updateSplitrecord);
     }
 
     /**
@@ -227,7 +254,8 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
      * 	Channel 分账+记账
      *
      */
-    private AskaSplitrecord calculateRecord(AskaSplitrecord askaSplitrecord, Integer maxValue, Integer retailAmount, Integer channelAmount) {
+    private AskaSplitrecord calculateRecord(Integer maxValue, Integer retailAmount, Integer channelAmount) {
+        AskaSplitrecord askaSplitrecord = new AskaSplitrecord();
         if (maxValue < retailAmount && maxValue < channelAmount) {
             askaSplitrecord.setRetailRealtimeAmount(0);
             askaSplitrecord.setRetailAccountAmount(retailAmount);
@@ -336,7 +364,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
     }
 
     public Boolean returnSplitApi(String pOrderSn, String account, Integer amount) {
-        if (StringUtils.isEmpty(account) || amount == null) {
+        if (StringUtils.isEmpty(account) || amount == null || amount == 0) {
             return false;
         }
         String url = "https://api.mch.weixin.qq.com/v3/profitsharing/return-orders";

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

@@ -103,10 +103,6 @@ public class RetailServiceImpl implements RetailService {
         askaRetailsVo.setAccountType(askaRetails.getAccountType());
         askaRetailsVo.setBalance(askaRetails.getBalance());
         askaRetailsVo.setRelation(askaRetails.getRelation());
-        askaRetailsVo.setTotalCashOut(askaRetails.getTotalCashOut());
-        askaRetailsVo.setTotalIncome(askaRetails.getTotalIncome());
-        askaRetailsVo.setTotalRefund(askaRetails.getTotalRefund());
-        askaRetailsVo.setTotalSplit(askaRetails.getTotalSplit());
         return askaRetailsVo;
     }
 }

service/target/maven-archiver/pom.properties

@@ -1,4 +1,4 @@
-#Created by Apache Maven 3.8.6
+#Created by Apache Maven 3.6.3
 version=1.0
 groupId=com.mofangchuxing
 artifactId=aska-service

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

@@ -1,28 +1,28 @@
-com/mofangchuxing/aska/service/config/RedissonConfig.class
-com/mofangchuxing/aska/service/impl/PayServiceImpl.class
-com/mofangchuxing/aska/service/impl/CouponServiceImpl.class
-com/mofangchuxing/aska/service/common/ClientCustomSSL.class
-com/mofangchuxing/aska/service/config/RedisConfig.class
-com/mofangchuxing/aska/service/common/XMLUtil.class
-com/mofangchuxing/aska/service/CouponService.class
-com/mofangchuxing/aska/service/impl/ProfitSharingServiceImpl.class
-com/mofangchuxing/aska/service/impl/RetailServiceImpl.class
-com/mofangchuxing/aska/service/common/PayCommonUtil.class
-com/mofangchuxing/aska/service/common/MyX509TrustManager.class
-com/mofangchuxing/aska/service/PayService.class
-com/mofangchuxing/aska/service/config/WxPayV3Config.class
-com/mofangchuxing/aska/service/impl/OrderServiceImpl.class
-com/mofangchuxing/aska/service/common/GenerateCodeUtil$Mythread.class
-com/mofangchuxing/aska/service/OrderService.class
-com/mofangchuxing/aska/service/RetailService.class
-com/mofangchuxing/aska/service/impl/ChannelServiceImpl.class
-com/mofangchuxing/aska/service/common/MD5Util.class
-com/mofangchuxing/aska/service/impl/UserServiceImpl.class
-com/mofangchuxing/aska/service/utils/PropertyCopyUtils.class
-com/mofangchuxing/aska/service/common/DelayNotifyComponent.class
-com/mofangchuxing/aska/service/ProfitSharingService.class
-com/mofangchuxing/aska/service/UserService.class
-com/mofangchuxing/aska/service/common/GenerateCodeUtil.class
-com/mofangchuxing/aska/service/ChannelService.class
-com/mofangchuxing/aska/service/utils/WxPayV3Utils.class
-com/mofangchuxing/aska/service/common/DelayNotifyComponent$1.class
+com\mofangchuxing\aska\service\config\RedisConfig.class
+com\mofangchuxing\aska\service\common\MD5Util.class
+com\mofangchuxing\aska\service\common\GenerateCodeUtil$Mythread.class
+com\mofangchuxing\aska\service\config\WxPayV3Config.class
+com\mofangchuxing\aska\service\common\PayCommonUtil.class
+com\mofangchuxing\aska\service\common\XMLUtil.class
+com\mofangchuxing\aska\service\CouponService.class
+com\mofangchuxing\aska\service\impl\PayServiceImpl.class
+com\mofangchuxing\aska\service\ChannelService.class
+com\mofangchuxing\aska\service\common\DelayNotifyComponent$1.class
+com\mofangchuxing\aska\service\impl\OrderServiceImpl.class
+com\mofangchuxing\aska\service\impl\UserServiceImpl.class
+com\mofangchuxing\aska\service\utils\WxPayV3Utils.class
+com\mofangchuxing\aska\service\RetailService.class
+com\mofangchuxing\aska\service\PayService.class
+com\mofangchuxing\aska\service\impl\ProfitSharingServiceImpl.class
+com\mofangchuxing\aska\service\ProfitSharingService.class
+com\mofangchuxing\aska\service\utils\PropertyCopyUtils.class
+com\mofangchuxing\aska\service\common\GenerateCodeUtil.class
+com\mofangchuxing\aska\service\common\ClientCustomSSL.class
+com\mofangchuxing\aska\service\common\DelayNotifyComponent.class
+com\mofangchuxing\aska\service\impl\RetailServiceImpl.class
+com\mofangchuxing\aska\service\common\MyX509TrustManager.class
+com\mofangchuxing\aska\service\UserService.class
+com\mofangchuxing\aska\service\OrderService.class
+com\mofangchuxing\aska\service\config\RedissonConfig.class
+com\mofangchuxing\aska\service\impl\ChannelServiceImpl.class
+com\mofangchuxing\aska\service\impl\CouponServiceImpl.class

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

@@ -1,26 +1,26 @@
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/RetailService.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/XMLUtil.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/CouponServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/UserServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/OrderService.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/PayCommonUtil.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/ChannelService.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/UserService.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/RedisConfig.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/RedissonConfig.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/ProfitSharingService.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/OrderServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/RetailServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/MD5Util.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/ProfitSharingServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/ClientCustomSSL.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/WxPayV3Config.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/GenerateCodeUtil.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/PayServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/utils/PropertyCopyUtils.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/CouponService.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/utils/WxPayV3Utils.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/DelayNotifyComponent.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/PayService.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/MyX509TrustManager.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/ChannelServiceImpl.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\utils\WxPayV3Utils.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\ProfitSharingServiceImpl.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\utils\PropertyCopyUtils.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\CouponService.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\OrderService.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\ClientCustomSSL.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\XMLUtil.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\MD5Util.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\ChannelServiceImpl.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\PayServiceImpl.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\config\RedissonConfig.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\CouponServiceImpl.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\GenerateCodeUtil.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\RetailService.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\UserServiceImpl.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\ProfitSharingService.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\ChannelService.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\config\WxPayV3Config.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\PayCommonUtil.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\OrderServiceImpl.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\MyX509TrustManager.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\config\RedisConfig.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\common\DelayNotifyComponent.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\impl\RetailServiceImpl.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\UserService.java
+H:\work\aska\service\src\main\java\com\mofangchuxing\aska\service\PayService.java