完成订单的分账逻辑

jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/MchDivisionReceiverMapper.xml

@@ -5,8 +5,9 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.jeequan.jeepay.core.entity.MchDivisionReceiver">
         <id column="receiver_id" property="receiverId" />
+        <result column="receiver_alias" property="receiverAlias" />
         <result column="receiver_group_id" property="receiverGroupId" />
-        <result column="receiver_name" property="receiverName" />
+        <result column="receiver_group_name" property="receiverGroupName" />
         <result column="mch_no" property="mchNo" />
         <result column="isv_no" property="isvNo" />
         <result column="app_id" property="appId" />
@@ -18,7 +19,6 @@
         <result column="relation_type_name" property="relationTypeName" />
         <result column="division_profit" property="divisionProfit" />
         <result column="state" property="state" />
-        <result column="channel_bind_state" property="channelBindState" />
         <result column="channel_bind_result" property="channelBindResult" />
         <result column="channel_ext_info" property="channelExtInfo" />
         <result column="bind_success_time" property="bindSuccessTime" />

jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/PayOrderDivisionRecordMapper.java

@@ -13,4 +13,7 @@ import com.jeequan.jeepay.core.entity.PayOrderDivisionRecord;
  */
 public interface PayOrderDivisionRecordMapper extends BaseMapper<PayOrderDivisionRecord> {
 
+    /** 查询全部分账成功金额 **/
+    Long sumSuccessDivisionAmount(String payOrderId);
+
 }

jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/PayOrderDivisionRecordMapper.xml

@@ -21,6 +21,7 @@
         <result column="channel_resp_result" property="channelRespResult" />
         <result column="receiver_id" property="receiverId" />
         <result column="receiver_group_id" property="receiverGroupId" />
+        <result column="receiver_alias" property="receiverAlias" />
         <result column="acc_type" property="accType" />
         <result column="acc_no" property="accNo" />
         <result column="acc_name" property="accName" />
@@ -32,4 +33,11 @@
         <result column="updated_at" property="updatedAt" />
     </resultMap>
 
+
+    <select id="sumSuccessDivisionAmount" resultType="Long">
+        select ifnull(sum(cal_division_amount), 0) from t_pay_order_division_record
+        where pay_order_id = #{payOrderId} and state = 1
+    </select>
+
+
 </mapper>

jeepay-service/src/main/java/com/jeequan/jeepay/service/mapper/PayOrderMapper.xml

@@ -16,7 +16,6 @@
         <result column="amount" property="amount" />
         <result column="mch_fee_rate" property="mchFeeRate" />
         <result column="mch_fee_amount" property="mchFeeAmount" />
-        <result column="mch_income_amount" property="mchIncomeAmount" />
         <result column="currency" property="currency" />
         <result column="state" property="state" />
         <result column="notify_state" property="notifyState" />

pom.xml

@@ -42,7 +42,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- 项目构建输出编码 -->
 
     <!-- 其他工具包 -->
-    <jeepay.sdk.java.version>1.2.0</jeepay.sdk.java.version>
+    <jeepay.sdk.java.version>1.3.0</jeepay.sdk.java.version>
     <fastjson.version>1.2.76</fastjson.version> <!-- fastjson -->
     <mybatis.plus.starter.version>3.4.2</mybatis.plus.starter.version>  <!-- mybatis plus -->
     <hutool.util.version>5.6.6</hutool.util.version>  <!-- hutool -->
@@ -150,7 +150,7 @@
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
-            <version>4.13.50.ALL</version>
+            <version>4.16.11.ALL</version>
         </dependency>
 
         <!-- 阿里云oss组件  -->