From 44d6edd53b7955d2047bf7b39d81a168b0df409f Mon Sep 17 00:00:00 2001 From: lifenlong Date: Tue, 15 Jun 2021 09:59:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=BC=94=E7=A4=BA=E7=AB=99=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index b4207081..0e617814 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java @@ -168,6 +168,7 @@ public class CategoryServiceImpl extends ServiceImpl i Category parentCategory = this.getById(category.getParentId()); category.setDeleteFlag(parentCategory.getDeleteFlag()); } + this.save(category); removeCache(); return true; } From 00182f5cfb710cd237be6fd0ebb456b2dfdfe2d1 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 16 Jun 2021 10:49:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/controller/setting/RegionManagerController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index 436de03a..ff6ce5d5 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -2,6 +2,7 @@ package cn.lili.controller.setting; import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; +import cn.lili.modules.base.aspect.DemoSite; import cn.lili.modules.base.service.RegionService; import cn.lili.modules.system.entity.dos.Region; import io.swagger.annotations.Api; @@ -29,6 +30,7 @@ public class RegionManagerController { @Autowired private RegionService regionService; + @DemoSite @PostMapping(value = "/sync") @ApiOperation(value = "同步高德行政地区数据") public void synchronizationData(String url) { From 6205693df6c315efb5b2ecaa1ef1dfb36065d864 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 16 Jun 2021 15:54:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=B3=A8=E8=A7=86=EF=BC=8C=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=AE=9Dh5=E6=94=AF=E4=BB=98=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/order/serviceimpl/OrderServiceImpl.java | 11 ++++++++--- .../payment/kit/plugin/alipay/AliPayRequest.java | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index c7178617..f8ebe134 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -121,16 +121,21 @@ public class OrderServiceImpl extends ServiceImpl implements @Override public void intoDB(TradeDTO tradeDTO) { + //存放购物车，即业务中的订单 List orders = new ArrayList<>(tradeDTO.getCartList().size()); + //存放自订单/订单日志 List orderItems = new ArrayList<>(); List orderLogs = new ArrayList<>(); + //拼团判定，不能参与自己创建的拼团 if (tradeDTO.getParentOrderSn() != null) { Order parentOrder = this.getBySn(tradeDTO.getParentOrderSn()); if (parentOrder.getMemberId().equals(UserContext.getCurrentUser().getId())) { throw new ServiceException("不能参与自己发起的拼团活动！"); } } - List list = new ArrayList<>(); + //订单集合 + List orderVOS = new ArrayList<>(); + //循环购物车商品集合 tradeDTO.getCartList().forEach(item -> { Order order = new Order(item, tradeDTO); if (OrderTypeEnum.PINTUAN.name().equals(order.getOrderType())) { @@ -150,9 +155,9 @@ public class OrderServiceImpl extends ServiceImpl implements sku -> orderItems.add(new OrderItem(sku, item, tradeDTO)) ); orderVO.setOrderItems(orderItems); - list.add(orderVO); + orderVOS.add(orderVO); }); - tradeDTO.setOrderVO(list); + tradeDTO.setOrderVO(orderVOS); //批量保存订单 this.saveBatch(orders); //批量保存 子订单 diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java index ceb0d134..f721a281 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java @@ -13,6 +13,7 @@ import com.alipay.api.request.AlipayTradePrecreateRequest; import com.alipay.api.request.AlipayTradeWapPayRequest; import com.alipay.api.response.AlipayTradeAppPayResponse; import com.alipay.api.response.AlipayTradePrecreateResponse; +import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -24,7 +25,7 @@ import java.io.PrintWriter; * @author Chopper * @date 2020/12/15 19:26 */ - +@Slf4j public class AliPayRequest { /** @@ -40,7 +41,7 @@ public class AliPayRequest { public static void wapPay(HttpServletResponse response, AlipayTradeWapPayModel model, String returnUrl, String notifyUrl) throws AlipayApiException, IOException { String form = wapPayStr(model, returnUrl, notifyUrl); response.setContentType("text/html;charset=UTF-8"); - + log.info("支付表单{}", form); PrintWriter out = response.getWriter(); out.write(form); out.flush();