Skip to content

Z
zion
提交 fcf44a4b authored 作者: zgy's avatar zgy
浏览文件
操作

修改订单

上级 2ec6dec3
隐藏空白字符变更
内嵌 并排
正在显示 包含 163 行增加 和 144 行删除
src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfItemOrderRDao.java
浏览文件 @ fcf44a4b
...@@ -17,6 +17,7 @@ public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> { ...@@ -17,6 +17,7 @@ public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> {
/** /**
* 批量保存 * 批量保存
*
* @param itemOrderRList * @param itemOrderRList
* @return * @return
*/ */
...@@ -27,4 +28,6 @@ public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> { ...@@ -27,4 +28,6 @@ public interface TbCfItemOrderRDao extends BaseDao<TbCfItemOrderREntity> {
String[] queryByItemOrderR(String orderId); String[] queryByItemOrderR(String orderId);
void updateById(String[] tbcfItemOrderR); void updateById(String[] tbcfItemOrderR);
void updateItemStatus(String[] ids);
} }
src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java
浏览文件 @ fcf44a4b
...@@ -445,7 +445,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -445,7 +445,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
tbCfOrder.setEnableFlag(StateConstant.INVALID); tbCfOrder.setEnableFlag(StateConstant.INVALID);
int res = tbCfOrderDao.update(tbCfOrder); int res = tbCfOrderDao.update(tbCfOrder);
if (res > 0) { if (res > 0) {
String[] tbcfItemOrderR=tbCfItemOrderRDao.queryByItemOrderR(orderId); String[] tbcfItemOrderR = tbCfItemOrderRDao.queryByItemOrderR(orderId);
tbCfItemOrderRDao.updateById(tbcfItemOrderR); tbCfItemOrderRDao.updateById(tbcfItemOrderR);
result.setMessage(ResultCodeEnum.SUCCESS.getDesc()); result.setMessage(ResultCodeEnum.SUCCESS.getDesc());
} else { } else {
...@@ -561,6 +561,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -561,6 +561,14 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
if (tbCfOrderVo != null) { if (tbCfOrderVo != null) {
orderRedisCache.set(KeyConstant.ORDER_DET + orderId, KeyConstant.ORDER_EXPIRE); orderRedisCache.set(KeyConstant.ORDER_DET + orderId, KeyConstant.ORDER_EXPIRE);
} }
//订单关闭（修改状态）
TbCfOrderEntity order = tbCfOrderDao.queryObject(orderId);
order.setOrderStatus(60);
order.setUpdateTime(new Date());
tbCfOrderDao.update(order);
//修改商品订单状态
String[] ids = tbCfItemOrderRDao.queryByItemOrderR(orderId);
tbCfItemOrderRDao.updateItemStatus(ids);
//订单取消原因 //订单取消原因
TbCfCancelEntity cancelEntity = new TbCfCancelEntity(); TbCfCancelEntity cancelEntity = new TbCfCancelEntity();
cancelEntity.setId(IdUtil.createIdbyUUID()); cancelEntity.setId(IdUtil.createIdbyUUID());
......
src/main/resources/mapper/TbCfItemOrderRDao.xml
浏览文件 @ fcf44a4b
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
<mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfItemOrderRDao"> <mapper namespace="com.diaoyun.zion.chinafrica.dao.TbCfItemOrderRDao">
<resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity" id="tbCfItemOrderRMap"> <resultMap type="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity" id="tbCfItemOrderRMap">
<result property="orderItemId" column="order_item_id"/> <result property="orderItemId" column="order_item_id"/>
<result property="itemId" column="item_id"/> <result property="itemId" column="item_id"/>
<result property="orderId" column="order_id"/> <result property="orderId" column="order_id"/>
<result property="enableFlag" column="enable_flag"/> <result property="enableFlag" column="enable_flag"/>
<result property="orderStatus" column="order_status"/> <result property="orderStatus" column="order_status"/>
<result property="deliveryFlag" column="delivery_flag"/> <result property="deliveryFlag" column="delivery_flag"/>
<result property="deliveryTime" column="delivery_time"/> <result property="deliveryTime" column="delivery_time"/>
<result property="closeTime" column="close_time"/> <result property="closeTime" column="close_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="isSend" column="is_send"/> <result property="isSend" column="is_send"/>
</resultMap> </resultMap>
<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
select select
`order_item_id`, `order_item_id`,
`item_id`, `item_id`,
...@@ -32,45 +32,45 @@ ...@@ -32,45 +32,45 @@
where order_item_id = #{id} where order_item_id = #{id}
</select> </select>
<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
select select
`order_item_id`, `order_item_id`,
`item_id`, `item_id`,
`order_id`, `order_id`,
`enable_flag`, `enable_flag`,
`order_status`, `order_status`,
`delivery_flag`, `delivery_flag`,
`delivery_time`, `delivery_time`,
`close_time`, `close_time`,
`is_send`, `is_send`,
`update_time` `update_time`
from tb_cf_item_order_r from tb_cf_item_order_r
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
<choose> <choose>
<when test="sidx != null and sidx.trim() != ''"> <when test="sidx != null and sidx.trim() != ''">
order by ${sidx} ${order} order by ${sidx} ${order}
</when> </when>
<otherwise> <otherwise>
order by order_item_id desc order by order_item_id desc
</otherwise> </otherwise>
</choose> </choose>
<if test="offset != null and limit != null"> <if test="offset != null and limit != null">
limit #{offset}, #{limit} limit #{offset}, #{limit}
</if> </if>
</select> </select>
<select id="queryTotal" resultType="int"> <select id="queryTotal" resultType="int">
select count(*) from tb_cf_item_order_r select count(*) from tb_cf_item_order_r
WHERE 1=1 WHERE 1=1
<if test="name != null and name.trim() != ''"> <if test="name != null and name.trim() != ''">
AND name LIKE concat('%',#{name},'%') AND name LIKE concat('%',#{name},'%')
</if> </if>
</select> </select>
<insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <insert id="save" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
insert into tb_cf_item_order_r( insert into tb_cf_item_order_r(
`order_item_id`, `order_item_id`,
`item_id`, `item_id`,
...@@ -95,119 +95,127 @@ ...@@ -95,119 +95,127 @@
#{updateTime}) #{updateTime})
</insert> </insert>
<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
update tb_cf_item_order_r update tb_cf_item_order_r
<set> <set>
<if test="itemId != null">`item_id` = #{itemId}, </if> <if test="itemId != null">`item_id` = #{itemId},</if>
<if test="orderId != null">`order_id` = #{orderId}, </if> <if test="orderId != null">`order_id` = #{orderId},</if>
<if test="enableFlag != null">`enable_flag` = #{enableFlag},</if> <if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
<if test="orderStatus != null">`order_status` = #{orderStatus},</if> <if test="orderStatus != null">`order_status` = #{orderStatus},</if>
<if test="deliveryFlag != null">`delivery_flag` = #{deliveryFlag},</if> <if test="deliveryFlag != null">`delivery_flag` = #{deliveryFlag},</if>
<if test="deliveryTime != null">`delivery_time` = #{deliveryTime},</if> <if test="deliveryTime != null">`delivery_time` = #{deliveryTime},</if>
<if test="closeTime != null">`close_time` = #{closeTime},</if> <if test="closeTime != null">`close_time` = #{closeTime},</if>
<if test="isSend != null">`is_send` = #{isSend},</if> <if test="isSend != null">`is_send` = #{isSend},</if>
<if test="updateTime != null">`update_time` = #{updateTime}</if> <if test="updateTime != null">`update_time` = #{updateTime}</if>
</set> </set>
where order_item_id = #{orderItemId} where order_item_id = #{orderItemId}
</update> </update>
<update id="updates" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <update id="updates" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
update tb_cf_item_order_r update tb_cf_item_order_r
<set> <set>
<if test="itemId != null">`item_id` = #{itemId}, </if> <if test="itemId != null">`item_id` = #{itemId},</if>
<if test="orderId != null">`order_id` = #{orderId}, </if> <if test="orderId != null">`order_id` = #{orderId},</if>
<if test="enableFlag != null">`enable_flag` = #{enableFlag},</if> <if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
<if test="orderStatus != null">`order_status` = #{orderStatus},</if> <if test="orderStatus != null">`order_status` = #{orderStatus},</if>
<if test="deliveryFlag != null">`delivery_flag` = #{deliveryFlag},</if> <if test="deliveryFlag != null">`delivery_flag` = #{deliveryFlag},</if>
<if test="deliveryTime != null">`delivery_time` = #{deliveryTime},</if> <if test="deliveryTime != null">`delivery_time` = #{deliveryTime},</if>
<if test="closeTime != null">`close_time` = #{closeTime},</if> <if test="closeTime != null">`close_time` = #{closeTime},</if>
<if test="isSend != null">`is_send` = #{isSend},</if> <if test="isSend != null">`is_send` = #{isSend},</if>
<if test="updateTime != null">`update_time` = #{updateTime}</if> <if test="updateTime != null">`update_time` = #{updateTime}</if>
</set> </set>
where order_id = #{orderId} where order_id = #{orderId}
</update> </update>
<select id="getItemNum" resultType="int"> <select id="getItemNum" resultType="int">
select t2.item_num from tb_cf_item_order_r t1 left join tb_cf_item_detail t2 on t1.item_id=t2.item_id where t1.order_item_id=#{ordersId} select t2.item_num from tb_cf_item_order_r t1 left join tb_cf_item_detail t2 on t1.item_id=t2.item_id where t1.order_item_id=#{ordersId}
</select> </select>
<delete id="delete"> <delete id="delete">
delete from tb_cf_item_order_r where order_item_id = #{value} delete from tb_cf_item_order_r where order_item_id = #{value}
</delete> </delete>
<delete id="deleteBatch"> <delete id="deleteBatch">
delete from tb_cf_item_order_r where order_item_id in delete from tb_cf_item_order_r where order_item_id in
<foreach item="orderItemId" collection="array" open="(" separator="," close=")"> <foreach item="orderItemId" collection="array" open="(" separator="," close=")">
#{orderItemId} #{orderItemId}
</foreach> </foreach>
</delete> </delete>
<select id="getOrderId" resultType="String"> <select id="getOrderId" resultType="String">
select order_id from tb_cf_item_order_r i where i.order_item_id=#{ordersId} select order_id from tb_cf_item_order_r i where i.order_item_id=#{ordersId}
</select> </select>
<select id="getItemId" resultType="String"> <select id="getItemId" resultType="String">
select item_id from tb_cf_item_order_r i where i.order_item_id=#{ordersId} select item_id from tb_cf_item_order_r i where i.order_item_id=#{ordersId}
</select> </select>
<update id="updateDeliveryTime" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <update id="updateDeliveryTime" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
update tb_cf_item_order_r r update tb_cf_item_order_r r
<set> <set>
<if test="deliveryTime != null">r.delivery_time = #{deliveryTime}, </if> <if test="deliveryTime != null">r.delivery_time = #{deliveryTime},</if>
</set> </set>
where r.order_item_id = #{orderItemId} and r.delivery_time is null where r.order_item_id = #{orderItemId} and r.delivery_time is null
</update> </update>
<select id="getOrderItemId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity"> <select id="getOrderItemId" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemOrderREntity">
select * from tb_cf_item_order_r where order_id=#{orderId} and item_id=#{itemId} select * from tb_cf_item_order_r where order_id=#{orderId} and item_id=#{itemId}
</select> </select>
<select id="getOrderStatus"> <select id="getOrderStatus">
select order_status from tb_cf_item_order_r where order_item_id=#{ordersId} select order_status from tb_cf_item_order_r where order_item_id=#{ordersId}
</select> </select>
<select id="findOrderStatus" > <select id="findOrderStatus">
select order_status from tb_cf_item_order_r where order_id=#{orderId} select order_status from tb_cf_item_order_r where order_id=#{orderId}
</select> </select>
<select id="queryByItemOrderR" resultType="String"> <select id="queryByItemOrderR" resultType="String">
select order_item_id from tb_cf_item_order_r where order_id=#{orderId} select order_item_id from tb_cf_item_order_r where order_id=#{orderId}
</select> </select>
<update id="updateById"> <update id="updateById">
UPDATE tb_cf_item_order_r UPDATE tb_cf_item_order_r
SET enable_flag=0 SET enable_flag=0
WHERE order_item_id in WHERE order_item_id in
<foreach collection="array" item="tbcfItemOrderR" open="(" separator="," close=")"> <foreach collection="array" item="tbcfItemOrderR" open="(" separator="," close=")">
#{tbcfItemOrderR} #{tbcfItemOrderR}
</foreach> </foreach>
</update> </update>
<update id="updateItemStatus">
<!--根据快递单号id，修改物流状态为已入中国仓库 --> UPDATE tb_cf_item_order_r
<update id="updateExpressStatus"> SET order_status=60
UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i WHERE order_item_id in
SET i.delivery_flag = 20 <foreach collection="array" item="ids" open="(" separator="," close=")">
WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=10 and p.p_express_number in #{ids}
<foreach collection="array" item="sids" open="(" separator="," close=")"> </foreach>
#{sids} </update>
</foreach> <!--根据快递单号id，修改物流状态为已入中国仓库 -->
</update> <update id="updateExpressStatus">
UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i
<!--根据快递单号id，修改物流状态为已入非洲仓库 --> SET i.delivery_flag = 20
<update id="updateExpressStatuss"> WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=10 and p.p_express_number in
UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i <foreach collection="array" item="sids" open="(" separator="," close=")">
SET i.delivery_flag = 40 #{sids}
WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=20 and i.is_send=0 and p.p_express_number in </foreach>
<foreach collection="array" item="sids" open="(" separator="," close=")"> </update>
#{sids}
</foreach> <!--根据快递单号id，修改物流状态为已入非洲仓库 -->
</update> <update id="updateExpressStatuss">
UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i
<!--根据快递单号id，修改物流状态为已签收 --> SET i.delivery_flag = 40
<update id="updateExpressStatusDelivery"> WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=20 and i.is_send=0 and
UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i p.p_express_number in
SET i.delivery_flag = 50,i.order_status=50 <foreach collection="array" item="sids" open="(" separator="," close=")">
WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=40 and p.p_express_number in #{sids}
<foreach collection="array" item="sids" open="(" separator="," close=")"> </foreach>
#{sids} </update>
</foreach>
</update> <!--根据快递单号id，修改物流状态为已签收 -->
<update id="updateExpressStatusDelivery">
UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i
SET i.delivery_flag = 50,i.order_status=50
WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=40 and p.p_express_number in
<foreach collection="array" item="sids" open="(" separator="," close=")">
#{sids}
</foreach>
</update>
</mapper> </mapper>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论