Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: e680f99865af925fc335aafec5e9462fc366efc1
+  newTag: 1e0951b360f4b2a283187932fec3867c3477e25d

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

@@ -317,7 +317,10 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
                 return  ResultBody.error("佣金不够支付,支付失败");
             }
         }
-        userAppApi.feignCurriculumOrderLog(request.getHeader("token"),request,curriculumOrderLogVO);
+        ResultBody resultBody1 = userAppApi.feignCurriculumOrderLog(request.getHeader("token"), request, curriculumOrderLogVO);
+        if(!"200".equals(resultBody1.getCode())){
+            return  ResultBody.error("支付失败");
+        }
         curriculumOrderDO.setOrderTotalAmount(curriculumInfoDO.getRequireAmout());
         curriculumOrderDO.setSalaryAmount(userSalaryAmt);
         curriculumOrderDO.setWeChat(weChatPay);

release-service/src/main/resources/mapper/flyer/CurriculumOrderDao.xml

@@ -6,7 +6,7 @@
 
     <sql id="Base_Column_List">
         id,order_no,user_account_id,
-        back_user_id,order_total_amount,salary_amount,
+        order_total_amount,salary_amount,
         cash_amount,we_chat,wechat_pay_order_number
     </sql>
 
@@ -42,7 +42,7 @@
             parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO" useGeneratedKeys="true">
         insert into curriculum_order
         ( id, order_no, user_account_id
-        , back_user_id, order_total_amount, salary_amount
+        , order_total_amount, salary_amount
         , cash_amount, we_chat, wechat_pay_order_number
         , create_time, update_time)
         values ( #{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{userAccountId,jdbcType=INTEGER}
@@ -57,7 +57,6 @@
             <if test="id != null">id,</if>
             <if test="orderNo != null">order_no,</if>
             <if test="userAccountId != null">user_account_id,</if>
-            <if test="backUserId != null">back_user_id,</if>
             <if test="orderTotalAmount != null">order_total_amount,</if>
             <if test="salaryAmount != null">salary_amount,</if>
             <if test="cashAmount != null">cash_amount,</if>
@@ -70,7 +69,6 @@
             <if test="id != null">#{id,jdbcType=INTEGER},</if>
             <if test="orderNo != null">#{orderNo,jdbcType=VARCHAR},</if>
             <if test="userAccountId != null">#{userAccountId,jdbcType=INTEGER},</if>
-            <if test="backUserId != null">#{backUserId,jdbcType=INTEGER},</if>
             <if test="orderTotalAmount != null">#{orderTotalAmount,jdbcType=DECIMAL},</if>
             <if test="salaryAmount != null">#{salaryAmount,jdbcType=DECIMAL},</if>
             <if test="cashAmount != null">#{cashAmount,jdbcType=DECIMAL},</if>
@@ -89,9 +87,6 @@
             <if test="userAccountId != null">
                 user_account_id = #{userAccountId,jdbcType=INTEGER},
             </if>
-            <if test="backUserId != null">
-                back_user_id = #{backUserId,jdbcType=INTEGER},
-            </if>
             <if test="orderTotalAmount != null">
                 order_total_amount = #{orderTotalAmount,jdbcType=DECIMAL},
             </if>
@@ -120,7 +115,6 @@
         update curriculum_order
         set order_no                = #{orderNo,jdbcType=VARCHAR},
             user_account_id         = #{userAccountId,jdbcType=INTEGER},
-            back_user_id            = #{backUserId,jdbcType=INTEGER},
             order_total_amount      = #{orderTotalAmount,jdbcType=DECIMAL},
             salary_amount           = #{salaryAmount,jdbcType=DECIMAL},
             cash_amount             = #{cashAmount,jdbcType=DECIMAL},