订单关闭功能

src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java

@@ -5,6 +5,7 @@ import cn.chjyj.szwh.bean.OrderGoodsDetail;
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.OrderGoodsDetailService;
 import cn.chjyj.szwh.service.OrderService;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -90,4 +91,34 @@ public class AdminOrderController extends BaseController {
         jsonObject.put("msg","操作成功");
         return jsonObject;
     }
+
+    @PostMapping("/orderInfo")
+    public JSONObject orderInfo(String batchcode){
+        Order order = orderService.getOrderByBatchcode(batchcode);
+        jsonObject.put("code",200);
+        jsonObject.put("data",order);
+        jsonObject.put("msg","成功");
+        return jsonObject;
+    }
+
+    /**
+     * 关闭订单
+     * @param batchcode
+     * @return
+     */
+    @PostMapping("/orderShut")
+    public JSONObject orderShut(String batchcode){
+        // 1 删除订单信息
+        int xx = orderService.shutOrder(batchcode);
+        // 2 删除订单产品
+        int yy =orderGoodsDetailService.delOrderGoodsByBatchCode(batchcode);
+        // 与运算结果
+        if((xx&yy)!=0){
+            jsonObject.put("msg","订单成功关闭");
+        }else{
+            jsonObject.put("msg","订单关闭不成功");
+        }
+        jsonObject.put("code",200);
+        return jsonObject;
+    }
 }

src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java

@@ -14,4 +14,12 @@ public interface OrderGoodsDetailMapper {
      * @return
      */
     OrderGoodsDetail getOrderGoodsDetailById(Integer id);
+
+    /**
+     * 删除订单商品
+     * soft delete
+     * @param batchcode
+     * @return
+     */
+    int delOrderGoodsByBatchCode(String batchcode);
 }

src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java

@@ -4,7 +4,7 @@ import cn.chjyj.szwh.bean.Order;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.security.PermitAll;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -50,5 +50,12 @@ public interface OrderMapper {
      * @param id
      * @return
      */
-    int updateOrderStatus(Map<String,Object> map,Integer id);
+    int updateOrderStatus(@Param("map") Map<String,Object> map,@Param("id") Integer id);
+
+    /**
+     * 关闭订单
+     * @param batchcode
+     * @return
+     */
+    int shutOrder(@Param("batchcode") String batchcode, @Param("shuttime") String shuttime);
 }

src/main/java/cn/chjyj/szwh/service/OrderGoodsDetailService.java

@@ -12,4 +12,11 @@ public interface OrderGoodsDetailService {
      * @return
      */
     OrderGoodsDetail getOrderGoodsById(Integer id);
+
+    /**
+     * 删除订单商品
+     * @param batchcode
+     * @return
+     */
+    int delOrderGoodsByBatchCode(String batchcode);
 }

src/main/java/cn/chjyj/szwh/service/OrderService.java

@@ -45,4 +45,11 @@ public interface OrderService {
      * @return
      */
     int updateOrderStatus(Map<String,Object> map,Integer id);
+
+    /**
+     * 关闭订单
+     * @param batchcode
+     * @return
+     */
+    int shutOrder(String batchcode);
 }

src/main/java/cn/chjyj/szwh/service/impl/OrderGoodsDetailServiceImpl.java

@@ -14,4 +14,9 @@ public class OrderGoodsDetailServiceImpl implements OrderGoodsDetailService {
     public OrderGoodsDetail getOrderGoodsById(Integer id) {
         return orderGoodsDetailMapper.getOrderGoodsDetailById(id);
     }
+
+    @Override
+    public int delOrderGoodsByBatchCode(String batchcode) {
+        return orderGoodsDetailMapper.delOrderGoodsByBatchCode(batchcode);
+    }
 }

src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

@@ -6,6 +6,8 @@ import cn.chjyj.szwh.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -42,4 +44,16 @@ public class OrderServiceImpl implements OrderService {
     public int updateOrderStatus(Map<String, Object> map, Integer id) {
         return orderMapper.updateOrderStatus(map,id);
     }
+
+    /**
+     * 关闭时间为当前
+     * @param batchcode
+     * @return
+     */
+    @Override
+    public int shutOrder(String batchcode) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String now = sdf.format(new Date());
+        return orderMapper.shutOrder(batchcode,now);
+    }
 }

src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml

@@ -106,4 +106,8 @@
         where uid=#{uid};
     </update>
 
+    <!--软删除订单商品-->
+    <update id="delOrderGoodsByBatchCode" parameterType="java.lang.String">
+        update <include refid="tbName" /> set is_deleted=1 where batchcode=#{batchcode}
+    </update>
 </mapper>

src/main/resources/mapper/szwh/OrderMapper.xml

@@ -95,4 +95,8 @@
         where id=#{id}
     </update>
 
+    <!-- 订单关闭    -->
+    <update id="shutOrder" parameterType="java.lang.String">
+        update <include refid="tbName"/> set `status`=5,shuttime=#{shuttime} where batchcode=#{batchcode}
+    </update>
 </mapper>

src/test/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapperTest.java

@@ -5,7 +5,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
 
 import static org.junit.Assert.*;
 
@@ -20,4 +22,13 @@ public class OrderGoodsDetailMapperTest {
         OrderGoodsDetail orderGoodsDetail = orderGoodsDetailMapper.getOrderGoodsDetailById(id);
         System.out.println(orderGoodsDetail.getGoodsImage());
     }
+
+    @Transactional
+    @Rollback
+    @Test
+    public void delOrderGoodsById(){
+        String batchcode ="1652850431002118";
+        int xx =orderGoodsDetailMapper.delOrderGoodsByBatchCode(batchcode);
+        System.out.println(xx);
+    }
 }

src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java

@@ -9,6 +9,8 @@ import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,4 +72,22 @@ public class OrderMapperTest {
         con.put("pay_status",1);
         orderMapper.updateOrderStatus(con,oid);
     }
+
+    /**
+     * 订单关闭
+     */
+    @Transactional
+    @Rollback
+    @Test
+    public void shutOrder(){
+        String batchcode="1652850431002118";
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //try {
+            //Date shuttime = sdf.parse(sdf.format(new Date()));
+            String shuttime = sdf.format(new Date());
+            orderMapper.shutOrder(batchcode, shuttime);
+        //}catch (Exception ex){
+        //    ex.printStackTrace();
+       // }
+    }
 }