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: 7162d642151a36be1c2cfb9892bf1c8cd47fb1c5
+  newTag: b6a25d9c83b2dded31840a6c9b27e40b72489cb0

release-service/src/main/java/com/mmc/csf/release/controller/FlyerTrainingController.java

@@ -5,7 +5,6 @@ import com.mmc.csf.common.util.math.CodeUtil;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.release.entity.curriculum.CurriculumInfoDO;
 import com.mmc.csf.release.entity.curriculum.CurriculumOrderDO;
-import com.mmc.csf.release.entity.curriculum.CurriculumOrderDO;
 import com.mmc.csf.release.entity.curriculum.CurriculumOrderQO;
 import com.mmc.csf.release.feign.PmsAppApi;
 import com.mmc.csf.release.feign.UserAppApi;

release-service/src/main/java/com/mmc/csf/release/entity/curriculum/CurriculumOrderQO.java

@@ -28,6 +28,9 @@ public class CurriculumOrderQO implements Serializable {
     @Min(value = 1, groups = Page.class)
     private Integer pageSize;
 
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
     public void buildCurrentPage() {
         this.pageNo = (pageNo - 1) * pageSize;
     }

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

@@ -10,118 +10,125 @@
         cash_amount,we_chat,wechat_pay_order_number
     </sql>
 
-    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from curriculum_order
-        where  id = #{id,jdbcType=INTEGER} 
+        where id = #{id,jdbcType=INTEGER}
     </select>
     <select id="getCountCurriculumOrder" resultType="java.lang.Integer">
         select count(id) from curriculum_order
-
+        <if test="orderNo!=null">
+            where   order_no = #{orderNo}
+        </if>
     </select>
     <select id="selectOrderList" resultType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from curriculum_order
+        <if test="orderNo!=null">
+            where   order_no = #{orderNo}
+        </if>
         order by create_time desc
         limit #{pageNo},#{pageSize}
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-        delete from curriculum_order
-        where  id = #{id,jdbcType=INTEGER} 
+        delete
+        from curriculum_order
+        where id = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO" useGeneratedKeys="true">
+    <insert id="insert" keyColumn="id" keyProperty="id"
+            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
-        ,cash_amount,we_chat,wechat_pay_order_number
-        ,create_time,update_time)
-        values (#{id,jdbcType=INTEGER},#{orderNo,jdbcType=VARCHAR},#{userAccountId,jdbcType=INTEGER}
-        ,#{backUserId,jdbcType=INTEGER},#{orderTotalAmount,jdbcType=DECIMAL},#{salaryAmount,jdbcType=DECIMAL}
-        ,#{cashAmount,jdbcType=DECIMAL},#{weChat,jdbcType=DECIMAL},#{wechatPayOrderNumber,jdbcType=VARCHAR}
-        ,#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})
+        ( id, order_no, user_account_id
+        , back_user_id, 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}
+               , #{backUserId,jdbcType=INTEGER}, #{orderTotalAmount,jdbcType=DECIMAL}, #{salaryAmount,jdbcType=DECIMAL}
+               , #{cashAmount,jdbcType=DECIMAL}, #{weChat,jdbcType=DECIMAL}, #{wechatPayOrderNumber,jdbcType=VARCHAR}
+               , #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
     </insert>
-    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO" useGeneratedKeys="true">
+    <insert id="insertSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO" useGeneratedKeys="true">
         insert into curriculum_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <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>
-                <if test="weChat != null">we_chat,</if>
-                <if test="wechatPayOrderNumber != null">wechat_pay_order_number,</if>
-                <if test="createTime != null">create_time,</if>
-                <if test="updateTime != null">update_time,</if>
+            <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>
+            <if test="weChat != null">we_chat,</if>
+            <if test="wechatPayOrderNumber != null">wechat_pay_order_number,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</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="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>
-                <if test="weChat != null">#{weChat,jdbcType=DECIMAL},</if>
-                <if test="wechatPayOrderNumber != null">#{wechatPayOrderNumber,jdbcType=VARCHAR},</if>
-                <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-                <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+            <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>
+            <if test="weChat != null">#{weChat,jdbcType=DECIMAL},</if>
+            <if test="wechatPayOrderNumber != null">#{wechatPayOrderNumber,jdbcType=VARCHAR},</if>
+            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO">
         update curriculum_order
         <set>
-                <if test="orderNo != null">
-                    order_no = #{orderNo,jdbcType=VARCHAR},
-                </if>
-                <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>
-                <if test="salaryAmount != null">
-                    salary_amount = #{salaryAmount,jdbcType=DECIMAL},
-                </if>
-                <if test="cashAmount != null">
-                    cash_amount = #{cashAmount,jdbcType=DECIMAL},
-                </if>
-                <if test="weChat != null">
-                    we_chat = #{weChat,jdbcType=DECIMAL},
-                </if>
-                <if test="wechatPayOrderNumber != null">
-                    wechat_pay_order_number = #{wechatPayOrderNumber,jdbcType=VARCHAR},
-                </if>
-                <if test="createTime != null">
-                    create_time = #{createTime,jdbcType=TIMESTAMP},
-                </if>
-                <if test="updateTime != null">
-                    update_time = #{updateTime,jdbcType=TIMESTAMP},
-                </if>
+            <if test="orderNo != null">
+                order_no = #{orderNo,jdbcType=VARCHAR},
+            </if>
+            <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>
+            <if test="salaryAmount != null">
+                salary_amount = #{salaryAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="cashAmount != null">
+                cash_amount = #{cashAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="weChat != null">
+                we_chat = #{weChat,jdbcType=DECIMAL},
+            </if>
+            <if test="wechatPayOrderNumber != null">
+                wechat_pay_order_number = #{wechatPayOrderNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
         </set>
-        where   id = #{id,jdbcType=INTEGER} 
+        where id = #{id,jdbcType=INTEGER}
     </update>
     <update id="updateByPrimaryKey" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO">
         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},
-            we_chat =  #{weChat,jdbcType=DECIMAL},
-            wechat_pay_order_number =  #{wechatPayOrderNumber,jdbcType=VARCHAR},
-            create_time =  #{createTime,jdbcType=TIMESTAMP},
-            update_time =  #{updateTime,jdbcType=TIMESTAMP}
-        where   id = #{id,jdbcType=INTEGER} 
+        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},
+            we_chat                 = #{weChat,jdbcType=DECIMAL},
+            wechat_pay_order_number = #{wechatPayOrderNumber,jdbcType=VARCHAR},
+            create_time             = #{createTime,jdbcType=TIMESTAMP},
+            update_time             = #{updateTime,jdbcType=TIMESTAMP}
+        where id = #{id,jdbcType=INTEGER}
     </update>