用户删除订单、优化

src/main/java/com/mmc/oms/dao/uav/UavOrderDao.java

@@ -47,4 +47,6 @@ public interface UavOrderDao {
     UavOrderPayDO getUavOrderPayById(Integer id);
 
     void updateUavOrderProportion(Integer id, Integer proportion);
+
+    void closeShowUavOrder(Integer id);
 }

src/main/java/com/mmc/oms/model/dto/uav/UavOrderExpressDTO.java

 package com.mmc.oms.model.dto.uav;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -38,8 +39,10 @@ public class UavOrderExpressDTO implements Serializable {
     @ApiModelProperty(value = "发货-收货详细地址")
     private String takeAddress;
     @ApiModelProperty(value = "发货-平台操作发货时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date sendTime;
     @ApiModelProperty(value = "取件时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date receiveTime;
     @ApiModelProperty(value = "是否已取件，0未取，1已取")
     private Integer receive;

src/main/java/com/mmc/oms/model/dto/uav/UavOrderPayDTO.java

 package com.mmc.oms.model.dto.uav;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -37,6 +38,7 @@ public class UavOrderPayDTO implements Serializable {
     @ApiModelProperty(value = "未通过原因")
     private String refuseReason;
     @ApiModelProperty(value = "提交时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date createTime;
     @ApiModelProperty(value = "0微信支付，1支付宝，2线下支付凭证")
     private Integer payType;

src/main/java/com/mmc/oms/model/dto/uav/UavOrderSkuDTO.java

 package com.mmc.oms.model.dto.uav;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -45,5 +46,6 @@ public class UavOrderSkuDTO implements Serializable {
     @ApiModelProperty("商品规格编号")
     private String skuNo;
     @ApiModelProperty("下单时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date createTime;
 }

src/main/java/com/mmc/oms/model/qo/uav/UavOrderQO.java

@@ -35,6 +35,9 @@ public class UavOrderQO implements Serializable {
     @ApiModelProperty(value = "商家id", hidden = true)
     private Integer thirdBackUserAccountId;
 
+    @ApiModelProperty(value = "订单是否展示给用户", hidden = true)
+    private Integer show;
+
     @ApiModelProperty(value = "开始时间")
     private String startTime;
 

src/main/java/com/mmc/oms/service/uav/impl/UavOrderServiceImpl.java

@@ -342,6 +342,7 @@ public class UavOrderServiceImpl implements UavOrderService {
     @Override
     public ResultBody listByUid(UavOrderQO uavOrderQO, BaseAccountDTO currentAccount) {
         uavOrderQO.setUserAccountId(currentAccount.getUserAccountId());
+        uavOrderQO.setShow(1);
         int count = uavOrderDao.countList(uavOrderQO);
         if (count == 0) {
             return ResultBody.success(PageResult.buildPage(uavOrderQO.getPageNo(), uavOrderQO.getPageSize(), count));
@@ -634,6 +635,12 @@ public class UavOrderServiceImpl implements UavOrderService {
 
     @Override
     public ResultBody removeUavOrder(Integer id) {
-        return null;
+        UavOrderDO uavOrderDO = uavOrderDao.detail(id);
+        if (!uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.FINISH.getCode().toString()) ||
+                !uavOrderDO.getStatusCode().toString().equals(UavOrderStatus.CLOSE.getCode().toString())) {
+            return ResultBody.error("不可删除！");
+        }
+        uavOrderDao.closeShowUavOrder(id);
+        return ResultBody.success();
     }
 }

src/main/resources/mapper/uav/UavOrderDao.xml

@@ -146,6 +146,10 @@
         update uav_order set proportion = #{proportion} where id = #{id}
     </update>
 
+    <update id="closeShowUavOrder">
+        update uav_order set show = 0 where id = #{id}
+    </update>
+
     <select id="detail" resultType="com.mmc.oms.entity.uav.UavOrderDO">
         select <include refid="uav_order_column" /> from uav_order where id = #{id}
     </select>
@@ -207,6 +211,9 @@
         <if test="endTime != null">
             and #{endTime} >= create_time
         </if>
+        <if test="show != null">
+            and #{show} = show
+        </if>
     </select>
 
     <select id="list" resultMap="uavOrderResultMap" parameterType="com.mmc.oms.model.qo.uav.UavOrderQO">
@@ -235,6 +242,9 @@
         <if test="endTime != null">
             and #{endTime} >= uo.create_time
         </if>
+        <if test="show != null">
+            and #{show} = show
+        </if>
         order by uo.id desc
         limit #{pageNo}, #{pageSize}
     </select>