lidongdong
2023-10-19 4ef3585b14a267e377cb14a5d6c5d1c95b316ba8
订单添加取消时间
4个文件已修改
30 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingOrderMapper.xml 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiShoppingOrderVO.java
@@ -49,6 +49,11 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date abolishTime;
    @ApiModelProperty(value = "商品名称")
    private String goodName;
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
@Slf4j
@Api(tags = {"金汇办事指南API 后台"})
@@ -679,6 +680,7 @@
        JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO();
        vo.setId(id);
        vo.setCancelType("1");
        vo.setCancelTime(new Date());
        return jinhuiCommunityService.orderEditData(vo);
    }
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiShoppingOrder.java
@@ -50,6 +50,11 @@
    private Date updateTime;
    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date abolishTime;
    @ApiModelProperty(value = "商品名称")
    private String goodName;
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiShoppingOrderMapper.xml
@@ -12,6 +12,7 @@
        <result property="palyMoney" column="paly_money" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
        <result property="abolishTime" column="abolish_time" />
    </resultMap>
    <!-- 分页查询 -->
@@ -36,6 +37,7 @@
            jso.cancel_type,
            jso.update_time,
            jso.cancel_time,
            jso.abolish_time,
            jso.paly_money
        from jinhui_shopping_order as jso
        LEFT JOIN sys_user su ON jso.user_id = su.user_id
@@ -87,6 +89,7 @@
            jso.cancel_type,
            jso.update_time,
            jso.cancel_time,
            jso.abolish_time,
            jso.paly_money
        from jinhui_shopping_order as jso
         LEFT JOIN sys_user su ON jso.user_id = su.user_id
@@ -114,11 +117,14 @@
            <if test="item.cancelType != null and item.cancelType != '' ">
                cancel_type,
            </if>
            <if test="item.cancelTime != null and item.cancelTime != '' ">
            <if test="item.cancelTime != null ">
                cancel_time,
            </if>
            <if test="item.palyMoney != null and item.palyMoney != '' ">
                paly_money,
            </if>
            <if test="item.abolishTime != null">
                abolish_time,
            </if>
            creation_time
        </trim>
@@ -139,11 +145,14 @@
            <if test="item.cancelType != null and item.cancelType != '' ">
                #{item.cancelType},
            </if>
            <if test="item.cancelTime != null and item.cancelTime != '' ">
            <if test="item.cancelTime != null ">
                #{item.cancelTime},
            </if>
            <if test="item.palyMoney != null and item.palyMoney != '' ">
                #{item.palyMoney},
            </if>
            <if test="item.abolishTime != null">
                #{item.abolishTime},
            </if>
            sysdate()
        </trim>
@@ -167,12 +176,15 @@
            <if test="item.cancelType != null and item.cancelType != '' ">
                cancel_type=#{item.cancelType},
            </if>
            <if test="item.cancelTime != null and item.cancelTime != '' ">
            <if test="item.cancelTime != null  ">
                cancel_time=#{item.cancelTime},
            </if>
            <if test="item.palyMoney != null and item.palyMoney != '' ">
                paly_money=#{item.palyMoney},
            </if>
            <if test="item.abolishTime != null">
                abolish_time=#{item.abolishTime},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}