Skip to content

I
ims
提交 0292a762 作者: han
操作

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

上级 17f554a5 97b46617
流水线 #7470 已通过 于阶段
in 2 分 39 秒
正在显示 包含 93 行增加 和 84 行删除
kustomization/overlays/dev/kustomization.yaml
...@@ -18,4 +18,4 @@ patches: ...@@ -18,4 +18,4 @@ patches:
images: images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG - name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims 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; ...@@ -5,7 +5,6 @@ import com.mmc.csf.common.util.math.CodeUtil;
import com.mmc.csf.common.util.web.ResultBody; import com.mmc.csf.common.util.web.ResultBody;
import com.mmc.csf.release.entity.curriculum.CurriculumInfoDO; 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.CurriculumOrderDO;
import com.mmc.csf.release.entity.curriculum.CurriculumOrderQO; import com.mmc.csf.release.entity.curriculum.CurriculumOrderQO;
import com.mmc.csf.release.feign.PmsAppApi; import com.mmc.csf.release.feign.PmsAppApi;
import com.mmc.csf.release.feign.UserAppApi; 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 { ...@@ -28,6 +28,9 @@ public class CurriculumOrderQO implements Serializable {
@Min(value = 1, groups = Page.class) @Min(value = 1, groups = Page.class)
private Integer pageSize; private Integer pageSize;
@ApiModelProperty(value = "订单编号")
private String orderNo;
public void buildCurrentPage() { public void buildCurrentPage() {
this.pageNo = (pageNo - 1) * pageSize; this.pageNo = (pageNo - 1) * pageSize;
} }
......
release-service/src/main/resources/mapper/flyer/CurriculumOrderDao.xml
...@@ -10,118 +10,125 @@ ...@@ -10,118 +10,125 @@
cash_amount,we_chat,wechat_pay_order_number cash_amount,we_chat,wechat_pay_order_number
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" > <select id="selectByPrimaryKey" parameterType="java.lang.Integer">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from curriculum_order from curriculum_order
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="getCountCurriculumOrder" resultType="java.lang.Integer"> <select id="getCountCurriculumOrder" resultType="java.lang.Integer">
select count(id) from curriculum_order select count(id) from curriculum_order
<if test="orderNo!=null">
where order_no = #{orderNo}
</if>
</select> </select>
<select id="selectOrderList" resultType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO"> <select id="selectOrderList" resultType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO">
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List"/>
from curriculum_order from curriculum_order
<if test="orderNo!=null">
where order_no = #{orderNo}
</if>
order by create_time desc order by create_time desc
limit #{pageNo},#{pageSize} limit #{pageNo},#{pageSize}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from curriculum_order delete
where id = #{id,jdbcType=INTEGER} from curriculum_order
where id = #{id,jdbcType=INTEGER}
</delete> </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 insert into curriculum_order
( id,order_no,user_account_id ( id, order_no, user_account_id
,back_user_id,order_total_amount,salary_amount , back_user_id, order_total_amount, salary_amount
,cash_amount,we_chat,wechat_pay_order_number , cash_amount, we_chat, wechat_pay_order_number
,create_time,update_time) , create_time, update_time)
values (#{id,jdbcType=INTEGER},#{orderNo,jdbcType=VARCHAR},#{userAccountId,jdbcType=INTEGER} values ( #{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{userAccountId,jdbcType=INTEGER}
,#{backUserId,jdbcType=INTEGER},#{orderTotalAmount,jdbcType=DECIMAL},#{salaryAmount,jdbcType=DECIMAL} , #{backUserId,jdbcType=INTEGER}, #{orderTotalAmount,jdbcType=DECIMAL}, #{salaryAmount,jdbcType=DECIMAL}
,#{cashAmount,jdbcType=DECIMAL},#{weChat,jdbcType=DECIMAL},#{wechatPayOrderNumber,jdbcType=VARCHAR} , #{cashAmount,jdbcType=DECIMAL}, #{weChat,jdbcType=DECIMAL}, #{wechatPayOrderNumber,jdbcType=VARCHAR}
,#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP}) , #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert> </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 insert into curriculum_order
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if> <if test="id != null">id,</if>
<if test="orderNo != null">order_no,</if> <if test="orderNo != null">order_no,</if>
<if test="userAccountId != null">user_account_id,</if> <if test="userAccountId != null">user_account_id,</if>
<if test="backUserId != null">back_user_id,</if> <if test="backUserId != null">back_user_id,</if>
<if test="orderTotalAmount != null">order_total_amount,</if> <if test="orderTotalAmount != null">order_total_amount,</if>
<if test="salaryAmount != null">salary_amount,</if> <if test="salaryAmount != null">salary_amount,</if>
<if test="cashAmount != null">cash_amount,</if> <if test="cashAmount != null">cash_amount,</if>
<if test="weChat != null">we_chat,</if> <if test="weChat != null">we_chat,</if>
<if test="wechatPayOrderNumber != null">wechat_pay_order_number,</if> <if test="wechatPayOrderNumber != null">wechat_pay_order_number,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=INTEGER},</if> <if test="id != null">#{id,jdbcType=INTEGER},</if>
<if test="orderNo != null">#{orderNo,jdbcType=VARCHAR},</if> <if test="orderNo != null">#{orderNo,jdbcType=VARCHAR},</if>
<if test="userAccountId != null">#{userAccountId,jdbcType=INTEGER},</if> <if test="userAccountId != null">#{userAccountId,jdbcType=INTEGER},</if>
<if test="backUserId != null">#{backUserId,jdbcType=INTEGER},</if> <if test="backUserId != null">#{backUserId,jdbcType=INTEGER},</if>
<if test="orderTotalAmount != null">#{orderTotalAmount,jdbcType=DECIMAL},</if> <if test="orderTotalAmount != null">#{orderTotalAmount,jdbcType=DECIMAL},</if>
<if test="salaryAmount != null">#{salaryAmount,jdbcType=DECIMAL},</if> <if test="salaryAmount != null">#{salaryAmount,jdbcType=DECIMAL},</if>
<if test="cashAmount != null">#{cashAmount,jdbcType=DECIMAL},</if> <if test="cashAmount != null">#{cashAmount,jdbcType=DECIMAL},</if>
<if test="weChat != null">#{weChat,jdbcType=DECIMAL},</if> <if test="weChat != null">#{weChat,jdbcType=DECIMAL},</if>
<if test="wechatPayOrderNumber != null">#{wechatPayOrderNumber,jdbcType=VARCHAR},</if> <if test="wechatPayOrderNumber != null">#{wechatPayOrderNumber,jdbcType=VARCHAR},</if>
<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if> <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if> <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
</trim> </trim>
</insert> </insert>
<update id="updateByPrimaryKeySelective" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO"> <update id="updateByPrimaryKeySelective" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO">
update curriculum_order update curriculum_order
<set> <set>
<if test="orderNo != null"> <if test="orderNo != null">
order_no = #{orderNo,jdbcType=VARCHAR}, order_no = #{orderNo,jdbcType=VARCHAR},
</if> </if>
<if test="userAccountId != null"> <if test="userAccountId != null">
user_account_id = #{userAccountId,jdbcType=INTEGER}, user_account_id = #{userAccountId,jdbcType=INTEGER},
</if> </if>
<if test="backUserId != null"> <if test="backUserId != null">
back_user_id = #{backUserId,jdbcType=INTEGER}, back_user_id = #{backUserId,jdbcType=INTEGER},
</if> </if>
<if test="orderTotalAmount != null"> <if test="orderTotalAmount != null">
order_total_amount = #{orderTotalAmount,jdbcType=DECIMAL}, order_total_amount = #{orderTotalAmount,jdbcType=DECIMAL},
</if> </if>
<if test="salaryAmount != null"> <if test="salaryAmount != null">
salary_amount = #{salaryAmount,jdbcType=DECIMAL}, salary_amount = #{salaryAmount,jdbcType=DECIMAL},
</if> </if>
<if test="cashAmount != null"> <if test="cashAmount != null">
cash_amount = #{cashAmount,jdbcType=DECIMAL}, cash_amount = #{cashAmount,jdbcType=DECIMAL},
</if> </if>
<if test="weChat != null"> <if test="weChat != null">
we_chat = #{weChat,jdbcType=DECIMAL}, we_chat = #{weChat,jdbcType=DECIMAL},
</if> </if>
<if test="wechatPayOrderNumber != null"> <if test="wechatPayOrderNumber != null">
wechat_pay_order_number = #{wechatPayOrderNumber,jdbcType=VARCHAR}, wechat_pay_order_number = #{wechatPayOrderNumber,jdbcType=VARCHAR},
</if> </if>
<if test="createTime != null"> <if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
</if> </if>
<if test="updateTime != null"> <if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
</if> </if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO"> <update id="updateByPrimaryKey" parameterType="com.mmc.csf.release.entity.curriculum.CurriculumOrderDO">
update curriculum_order update curriculum_order
set set order_no = #{orderNo,jdbcType=VARCHAR},
order_no = #{orderNo,jdbcType=VARCHAR}, user_account_id = #{userAccountId,jdbcType=INTEGER},
user_account_id = #{userAccountId,jdbcType=INTEGER}, back_user_id = #{backUserId,jdbcType=INTEGER},
back_user_id = #{backUserId,jdbcType=INTEGER}, order_total_amount = #{orderTotalAmount,jdbcType=DECIMAL},
order_total_amount = #{orderTotalAmount,jdbcType=DECIMAL}, salary_amount = #{salaryAmount,jdbcType=DECIMAL},
salary_amount = #{salaryAmount,jdbcType=DECIMAL}, cash_amount = #{cashAmount,jdbcType=DECIMAL},
cash_amount = #{cashAmount,jdbcType=DECIMAL}, we_chat = #{weChat,jdbcType=DECIMAL},
we_chat = #{weChat,jdbcType=DECIMAL}, wechat_pay_order_number = #{wechatPayOrderNumber,jdbcType=VARCHAR},
wechat_pay_order_number = #{wechatPayOrderNumber,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP},
create_time = #{createTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP}
update_time = #{updateTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER}
</update> </update>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论