From 038235bbe9f93f7bc72c88a47aa8b5937144e57d Mon Sep 17 00:00:00 2001 From: DB <2502523450@qq.com> Date: Tue, 7 Nov 2023 17:58:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=99=90=E8=B4=AD=E7=AD=96?= =?UTF-8?q?=E7=95=A5;=E9=A2=84=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B4=AD=E7=89=A9=E8=BD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cpop/core/gateway/sys/SysLoginInfoBuild.java | 4 +++- Cpop-Mall/Cpop-Mall-Web/pom.xml | 1 + .../test/java/com/cpop/mall/web/CpopWxPayTests.java | 13 ++++++++----- .../com/cpop/mall/business/bo/AdvanceOrderBo.java | 6 ++++++ .../java/com/cpop/mall/business/bo/OrderPageBo.java | 12 ++++++------ .../com/cpop/mall/business/bo/ShoppingCartBo.java | 1 + .../com/cpop/mall/business/entity/OrderDetail.java | 1 + .../service/impl/OrderRefundServiceImpl.java | 8 +++++++- .../business/service/impl/OrderServiceImpl.java | 13 +++++++++---- .../business/service/impl/ProductServiceImpl.java | 3 ++- .../service/impl/ShoppingCartServiceImpl.java | 3 ++- .../strategy/buyRestrict/UserRestrictStrategy.java | 2 +- 12 files changed, 47 insertions(+), 20 deletions(-) diff --git a/Cpop-Core/src/main/java/com/cpop/core/gateway/sys/SysLoginInfoBuild.java b/Cpop-Core/src/main/java/com/cpop/core/gateway/sys/SysLoginInfoBuild.java index 8f5fab4..5a1b3f9 100644 --- a/Cpop-Core/src/main/java/com/cpop/core/gateway/sys/SysLoginInfoBuild.java +++ b/Cpop-Core/src/main/java/com/cpop/core/gateway/sys/SysLoginInfoBuild.java @@ -99,7 +99,9 @@ public class SysLoginInfoBuild extends AbstractLoginInfoBuild { staffLoginInfo.setBrandId(row.getString("brandId")); staffLoginInfo.setSourceType(SourceType.valueOf(row.getString("sourceType"))); } else { - staffLoginInfo.setName(Constants.SUPER_ADMIN) + //超级管理员 + staffLoginInfo.setId("1") + .setName(Constants.SUPER_ADMIN) .setSourceType(SourceType.COMMON); } return new LoginUser(staffLoginInfo, staffLoginInfo.getId(), getPermissionSet(sysUser.getUserName(), staffLoginInfo.getRoleId())); diff --git a/Cpop-Mall/Cpop-Mall-Web/pom.xml b/Cpop-Mall/Cpop-Mall-Web/pom.xml index 29bffac..cdf923b 100644 --- a/Cpop-Mall/Cpop-Mall-Web/pom.xml +++ b/Cpop-Mall/Cpop-Mall-Web/pom.xml @@ -28,6 +28,7 @@ + Cpop-Mall-Web org.springframework.boot diff --git a/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java b/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java index 21610e7..1ce3da7 100644 --- a/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java +++ b/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java @@ -47,19 +47,22 @@ public class CpopWxPayTests { @Test public void refund() throws WxPayException { Brand brand = SpringUtils.getBean(BrandService.class).getById("75140168047210496"); - Order order = SpringUtils.getBean(OrderService.class).getById("78954327589658624"); + //Order order = SpringUtils.getBean(OrderService.class).getById("78954327589658624"); WxPayRefundV3Request request = new WxPayRefundV3Request(); WxPayRefundV3Request.Amount amount = new WxPayRefundV3Request.Amount(); //退款金额(单位分) - int refund = order.getTotalAmount().scaleByPowerOfTen(2).intValue(); + //int refund = order.getTotalAmount().scaleByPowerOfTen(2).intValue(); + int refund = 1; amount.setRefund(refund) .setTotal(refund) .setCurrency("CNY"); - request.setTransactionId(order.getOutOrderNo()) - .setSubMchid(wxPayService.getConfig().getSubMchId()) + request.setSubMchid(wxPayService.getConfig().getSubMchId()) + .setTransactionId("4200002027202310279036554434") + .setOutTradeNo("75505378790948864") + //.setTransactionId(order.getOutOrderNo()) + //.setOutTradeNo(order.getId()) .setNotifyUrl(wxPayProperties.getNotifyRefund()) .setOutRefundNo(IdUtils.fastSimpleUUID()) - .setOutTradeNo(order.getId()) .setSubMchid(brand.getWxMchId()) .setReason("接口测试退款") .setAmount(amount); diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/AdvanceOrderBo.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/AdvanceOrderBo.java index 68a7e69..0c5b7bc 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/AdvanceOrderBo.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/AdvanceOrderBo.java @@ -57,6 +57,12 @@ public class AdvanceOrderBo implements Serializable { @ApiModelProperty(value = "支付用户名") private String payUserName; + /** + * 购物车ids + */ + @ApiModelProperty(value = "购物车ids") + private List shoppingCartIds; + /** * 订单详情 */ diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/OrderPageBo.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/OrderPageBo.java index 7f03669..4cc7cf0 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/OrderPageBo.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/OrderPageBo.java @@ -24,16 +24,16 @@ public class OrderPageBo implements Serializable { private String productName; /** - * 支付用户 + * 收货人 */ - @ApiModelProperty("支付用户") - private String payUserName; + @ApiModelProperty("收货人") + private String receiveName; /** - * 接收人手机号 + * 收货人手机号 */ - @ApiModelProperty("接收人手机号") - private String payUserPhone; + @ApiModelProperty("收货人手机号") + private String receivePhone; /** * 订单状态(0:待付款;1:待发货;2:待确认;3:已完成;4:退款/售后中) diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/ShoppingCartBo.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/ShoppingCartBo.java index 00c10b4..a804275 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/ShoppingCartBo.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/bo/ShoppingCartBo.java @@ -54,4 +54,5 @@ public class ShoppingCartBo implements Serializable { @NotNull(message = "数量不能为空") @ApiModelProperty(value = "数量",required = true) private Integer number; + } diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/entity/OrderDetail.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/entity/OrderDetail.java index 7329aac..423a4b2 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/entity/OrderDetail.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/entity/OrderDetail.java @@ -36,6 +36,7 @@ public class OrderDetail extends BaseEntity implements Serializable { /** * 商品记录id */ + @Id private String productRecordId; /** diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java index d847420..92f77a5 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderRefundServiceImpl.java @@ -32,6 +32,7 @@ import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import static com.cpop.core.base.table.table.SysUserTableDef.SYS_USER; import static com.cpop.mall.business.entity.table.OrderRefundTableDef.ORDER_REFUND; @@ -115,12 +116,17 @@ public class OrderRefundServiceImpl extends ServiceImpl implements .select(ORDER.ALL_COLUMNS) .from(ORDER) .leftJoin(SYS_USER).on(SYS_USER.ID.eq(ORDER.PAY_USER_ID)) - .and(ORDER.PAY_USER_NAME.like(bo.getPayUserName())) - .and(SYS_USER.PHONE_NUMBER.like(bo.getPayUserPhone())) + .and(ORDER.RECEIVE_NAME.like(bo.getReceiveName())) + .and(ORDER.RECEIVE_PHONE.like(bo.getReceivePhone())) .and(ORDER.PRODUCT_NAMES.like(bo.getProductName())) .and(SYS_USER.USER_TYPE.eq("MINI_USER")) .orderBy(ORDER.CREATE_TIME.desc()), @@ -162,7 +163,7 @@ public class OrderServiceImpl extends ServiceImpl implements //获取涉及到的商品 ProductService productService = SpringUtils.getBean(ProductService.class); List productList = productService.queryChain() - .select(PRODUCT.ID, PRODUCT.PRODUCT_NAME, PRODUCT.DESCRIPTION) + .select(PRODUCT.ID, PRODUCT.PRODUCT_NAME, PRODUCT.DESCRIPTION, PRODUCT.BUY_RESTRICT, PRODUCT.LIMIT_NUM) .from(PRODUCT) .leftJoin(PRODUCT_RECORD).on(PRODUCT_RECORD.PRODUCT_ID.eq(PRODUCT.ID)) .where(PRODUCT_RECORD.ID.in(recordIds)) @@ -202,6 +203,10 @@ public class OrderServiceImpl extends ServiceImpl implements item.setOrderId(order.getId()); }); SpringUtils.getBean(OrderDetailService.class).saveBatch(orderDetails); + //移除购物车 + if (null != bo.getShoppingCartIds()&& !bo.getShoppingCartIds().isEmpty()){ + SpringUtils.getBean(ShoppingCartService.class).removeByIds(bo.getShoppingCartIds()); + } return order.getId(); } catch (Exception e) { //回滚库存 @@ -503,7 +508,7 @@ public class OrderServiceImpl extends ServiceImpl implements @Override public void inputLogisticsOrder(LogisticsOrderBo bo) { this.updateChain().setRaw(ORDER.PREVIOUS_STATUS, ORDER.ORDER_STATUS) - .set(ORDER.ORDER_STATUS, 2) + .set(ORDER.ORDER_STATUS, 3) .set(ORDER.LOGISTICS_ORDER, bo.getLogisticsOrder()) .where(ORDER.ID.eq(bo.getId())).update(); } diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java index 242c49f..c5ce852 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ProductServiceImpl.java @@ -302,7 +302,8 @@ public class ProductServiceImpl extends ServiceImpl impl .select("tct.template_id AS id,tct.brand_id,tct.name") .from("t_card_template").as("tct") .leftJoin("t_brand_info").as("tbi").on("tbi.id = tct.brand_id") - .where("tbi.brand_id = ?", brandExtend.getBrandCloudId())); + .where("tbi.brand_id = ?", brandExtend.getBrandCloudId()) + .or("tct.brand_id = ?", brandExtend.getBrandCloudId())); cardTemplateListVos = RowUtil.toEntityList(rowList, JamboxCardTemplateListVo.class); } finally { DataSourceKey.clear(); diff --git a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ShoppingCartServiceImpl.java b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ShoppingCartServiceImpl.java index 0b23bd3..2602b46 100644 --- a/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ShoppingCartServiceImpl.java +++ b/Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/ShoppingCartServiceImpl.java @@ -59,7 +59,8 @@ public class ShoppingCartServiceImpl extends ServiceImpl num.get()) { + if (product.getLimitNum() - count < num.get()) { //存在过购买记录 throw new ServiceException("您购买的商品已超出限制,无法购买商品" + product.getProductName()); }