From 5a70315772368e51bc22308b4f9b6504a0d59381 Mon Sep 17 00:00:00 2001 From: xioayue Date: Thu, 7 Jul 2022 18:05:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=85=B3=E9=97=AD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AdminOrderController.java | 31 +++++++++++++++++++ .../szwh/mapper/OrderGoodsDetailMapper.java | 8 +++++ .../cn/chjyj/szwh/mapper/OrderMapper.java | 11 +++++-- .../szwh/service/OrderGoodsDetailService.java | 7 +++++ .../cn/chjyj/szwh/service/OrderService.java | 7 +++++ .../impl/OrderGoodsDetailServiceImpl.java | 5 +++ .../szwh/service/impl/OrderServiceImpl.java | 14 +++++++++ .../mapper/szwh/OrderGoodsDetailMapper.xml | 4 +++ .../resources/mapper/szwh/OrderMapper.xml | 4 +++ .../mapper/OrderGoodsDetailMapperTest.java | 11 +++++++ .../cn/chjyj/szwh/mapper/OrderMapperTest.java | 20 ++++++++++++ 11 files changed, 120 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java index 7a23ea2..c5294ce 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java +++ b/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; + } } diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java index 3a12736..ab5b0a4 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapper.java +++ b/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); } diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java index 1dbd6d3..7aaaa9c 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java +++ b/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 map,Integer id); + int updateOrderStatus(@Param("map") Map map,@Param("id") Integer id); + + /** + * 关闭订单 + * @param batchcode + * @return + */ + int shutOrder(@Param("batchcode") String batchcode, @Param("shuttime") String shuttime); } diff --git a/src/main/java/cn/chjyj/szwh/service/OrderGoodsDetailService.java b/src/main/java/cn/chjyj/szwh/service/OrderGoodsDetailService.java index fd185a7..298769e 100644 --- a/src/main/java/cn/chjyj/szwh/service/OrderGoodsDetailService.java +++ b/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); } diff --git a/src/main/java/cn/chjyj/szwh/service/OrderService.java b/src/main/java/cn/chjyj/szwh/service/OrderService.java index 95fc441..30df12d 100644 --- a/src/main/java/cn/chjyj/szwh/service/OrderService.java +++ b/src/main/java/cn/chjyj/szwh/service/OrderService.java @@ -45,4 +45,11 @@ public interface OrderService { * @return */ int updateOrderStatus(Map map,Integer id); + + /** + * 关闭订单 + * @param batchcode + * @return + */ + int shutOrder(String batchcode); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderGoodsDetailServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderGoodsDetailServiceImpl.java index bb1eb71..34d6fb9 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderGoodsDetailServiceImpl.java +++ b/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); + } } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java index f8b50ad..c035a12 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/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 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); + } } diff --git a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml index 79235d6..6c2be9b 100644 --- a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml +++ b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml @@ -106,4 +106,8 @@ where uid=#{uid}; + + + update set is_deleted=1 where batchcode=#{batchcode} + \ No newline at end of file diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml index 55d0a1a..a1726f5 100644 --- a/src/main/resources/mapper/szwh/OrderMapper.xml +++ b/src/main/resources/mapper/szwh/OrderMapper.xml @@ -95,4 +95,8 @@ where id=#{id} + + + update set `status`=5,shuttime=#{shuttime} where batchcode=#{batchcode} + \ No newline at end of file diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapperTest.java index 16067cd..4586ba8 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/OrderGoodsDetailMapperTest.java +++ b/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); + } } \ No newline at end of file diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java index 0a4567e..a57fd1a 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java +++ b/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(); + // } + } } \ No newline at end of file