01

src/main/java/live/tomey/api/express/controller/OrderController.java

@@ -33,6 +33,27 @@ public class OrderController {
     @Autowired
     private OrderService orderService;
 
+    @UserLoginToken
+    @RequestMapping(value = "/cancel", method = RequestMethod.POST)
+    private Result<Map<String, Object>> cancel(HttpServletRequest request) {
+        Account account = (Account)request.getSession().getAttribute("account");
+        try{
+            Integer orderid = HttpServletRequestUtil.getInteger(request, "orderid");
+            Integer type = orderService.cancelOrder(orderid, account.getId());
+            if (type==1){
+                return new Result(true, "删除成功");
+            }else if (type==0){
+                return new Result(false, "删除失败");
+            }else if (type == 2){
+                return new Result(false, "订单已无法删除");
+            }else {
+                return new Result(false, OrderEnum.OFFLINE.getState(), OrderEnum.OFFLINE.getStateInfo());
+            }
+        }catch (RuntimeException e) {
+            logger.error(e.getMessage());
+            return new Result(false, OrderEnum.OFFLINE.getState(), OrderEnum.OFFLINE.getStateInfo());
+        }
+    }
     @UserLoginToken
     @RequestMapping(value = "/charge", method = RequestMethod.POST)
     private Result<Map<String, Object>> charge(HttpServletRequest request) {

src/main/java/live/tomey/api/express/dao/OrderDao.java

@@ -107,5 +107,11 @@ public interface OrderDao {
      */
     Integer queryChargeStart(@Param("orderModifyState") OrderModifyState orderModifyState);
 
+    /**
+     * 删除订单
+     * @param orderid
+     * @return
+     */
+    Integer deleteOrder(@Param("orderid") Integer orderid,@Param("accountid") Integer accountid);
 
 }

src/main/java/live/tomey/api/express/service/OrderService.java

@@ -29,5 +29,6 @@ public interface OrderService {
 
     OrderExcution changCharge(OrderModifyState orderModifyState);
 
+    Integer cancelOrder(Integer orderid,Integer acountid);
 
 }

src/main/java/live/tomey/api/express/service/impl/OrderServiceImpl.java

@@ -182,4 +182,23 @@ public class OrderServiceImpl implements OrderService {
             return new OrderExcution<List<OrderCourier>>(OrderEnum.OFFLINE);
         }
     }
+
+    @Override
+    public Integer cancelOrder(Integer orderid, Integer acountid) {
+        try {
+            Integer state = orderDao.queryStart(orderid);
+            if (state==1){
+                Integer type = orderDao.deleteOrder(orderid,acountid);
+                if (type==1){
+                    return 1;
+                }else {
+                    return 0;
+                }
+            }else {
+                return 2;
+            }
+        }catch (RuntimeException e){
+            return -1;
+        }
+    }
 }

src/main/resources/mapper/OrderDao.xml

@@ -437,4 +437,7 @@
             WHERE id = #{item.id}
         </foreach>
     </update>
+    <delete id="deleteOrder" parameterType="Integer">
+        DELETE FROM m_order WHERE id= #{orderid} AND account_id = #{accountid}
+    </delete>
 </mapper>