From 9ea0ed39137ded48ccd490cfe6d931d34d5c82d6 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 04 六月 2024 11:19:09 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 3 -
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java | 3 +
ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 29 +++------
ruoyi-api/ruoyi-api-system/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 6 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java | 4 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java | 11 ---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java | 6 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java | 5 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 46 +++++++--------
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java | 7 ++
/dev/null | 5 -
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/inner/CouponMemberController.java | 6 ++
ruoyi-common/ruoyi-common-core/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 3
13 files changed, 73 insertions(+), 61 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
index c5ee7ad..7c7f87a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Order.java
@@ -129,5 +129,11 @@
@ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
private Integer invoiceStatus;
+ @ApiModelProperty(value = "优惠券id")
+ private Long couponId;
+
+ @ApiModelProperty(value = "商品id")
+ private Long goodsSkuId;
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
index f16bb1b..142e401 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
@@ -30,6 +30,11 @@
public R<CouponMember> getCouponMember(CouponMemberDTO couponMemberDTO, String source) {
return R.fail("获取会员优惠券信息失败:" + cause.getMessage());
}
+
+ @Override
+ public R<?> updCouponMember(CouponMemberDTO couponMemberDTO, String source) {
+ return R.fail("修改会员优惠券信息失败:" + cause.getMessage());
+ }
};
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java
index ac5cfc1..1d41793 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/PromotionClient.java
@@ -30,4 +30,8 @@
R<CouponMember> getCouponMember(@RequestBody CouponMemberDTO couponMemberDTO,
@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+ @PostMapping("/coupon-member/updCouponMember")
+ R<?> updCouponMember(@RequestBody CouponMemberDTO couponMemberDTO,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
}
diff --git a/ruoyi-api/ruoyi-api-system/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-api/ruoyi-api-system/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 4918e8c..3396a4b 100644
--- a/ruoyi-api/ruoyi-api-system/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-api/ruoyi-api-system/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -2,3 +2,9 @@
com.ruoyi.system.api.factory.RemoteLogFallbackFactory
com.ruoyi.system.api.factory.RemoteFileFallbackFactory
com.ruoyi.system.api.factory.SysUserFallbackFactory
+com.ruoyi.system.api.factory.GoodsSkuFactory
+com.ruoyi.system.api.factory.ArticleFallbackFactory
+com.ruoyi.system.api.factory.AuctionFallbackFactory
+com.ruoyi.system.api.factory.MemberFallbackFactory
+com.ruoyi.system.api.factory.OrderFallbackFactory
+com.ruoyi.system.api.factory.PromotionFallbackFactory
diff --git a/ruoyi-common/ruoyi-common-core/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 67000ea..30d456d 100644
--- a/ruoyi-common/ruoyi-common-core/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/ruoyi-common/ruoyi-common-core/target/classes/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1,2 @@
-com.ruoyi.common.core.utils.SpringUtils
\ No newline at end of file
+com.ruoyi.common.core.utils.SpringUtils
+com.ruoyi.common.core.config.MybatisPlusConfig
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
index 9b4c7db..b06eb0a 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
@@ -37,9 +37,6 @@
@Resource
private IMemberService iMemberService;
-
-
-
@PostMapping("/miniLogin")
@ApiOperation(value = "用户端-第三方登陸")
public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderMallController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderMallController.java
deleted file mode 100644
index 2bc62b3..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderMallController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.order.controller.inner;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 商城订单表 前端控制器
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-@RestController
-@RequestMapping("/order-mall")
-public class OrderMallController {
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderMall.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderMall.java
deleted file mode 100644
index 4cbd2f2..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/OrderMall.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.ruoyi.order.domain;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 商城订单表
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("t_order_mall")
-@ApiModel(value = "OrderMall对象", description = "商城订单表")
-public class OrderMall implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "商城订单id")
- @TableId(value = "id", type = IdType.ASSIGN_ID)
- private Long id;
-
- @ApiModelProperty(value = "优惠券id")
- private Long couponId;
-
- @ApiModelProperty(value = "订单id")
- private Long orderId;
-
- @ApiModelProperty(value = "商品id")
- private Long goodsSkuId;
-
- @ApiModelProperty(value = "秒杀/团购 商品id")
- private Long activityId;
-
- @ApiModelProperty(value = "创建者")
- @TableField(value = "create_by", fill = FieldFill.INSERT)
- private String createBy;
-
- @ApiModelProperty(value = "创建时间")
- @TableField(value = "create_time", fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "更新者")
- @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- @ApiModelProperty(value = "更新时间")
- @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "删除标志（0代表存在 1代表删除）")
- @TableLogic
- private Integer delFlag;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMallMapper.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMallMapper.java
deleted file mode 100644
index e4b451c..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMallMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.order.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.order.domain.OrderMall;
-
-/**
- * <p>
- * 商城订单表 Mapper 接口
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-public interface OrderMallMapper extends BaseMapper<OrderMall> {
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderMallService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderMallService.java
deleted file mode 100644
index 2ac6a62..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderMallService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.ruoyi.order.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.domain.OrderMall;
-
-/**
- * <p>
- * 商城订单表 服务类
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-public interface IOrderMallService extends IService<OrderMall> {
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
index e488b09..9578167 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MemberInvoiceServiceImpl.java
@@ -11,13 +11,11 @@
import com.ruoyi.order.domain.MemberInvoice;
import com.ruoyi.order.domain.MemberInvoiceOrder;
import com.ruoyi.order.domain.OrderAuction;
-import com.ruoyi.order.domain.OrderMall;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.mapper.MemberInvoiceMapper;
import com.ruoyi.order.service.IMemberInvoiceOrderService;
import com.ruoyi.order.service.IMemberInvoiceService;
import com.ruoyi.order.service.IOrderAuctionService;
-import com.ruoyi.order.service.IOrderMallService;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
@@ -42,8 +40,7 @@
@Resource
private IMemberInvoiceOrderService iMemberInvoiceOrderService;
- @Resource
- private IOrderMallService iOrderMallService;
+
@Resource
private IOrderService iOrderService;
@@ -80,11 +77,7 @@
memberInvoiceOrder1.setOrderNo(order.getOrderNo());
String OrderName="";
if (order.getOrderFrom().equals(OrderFromEnum.COMMODITY_ORDER)||order.getOrderFrom().equals(OrderFromEnum.SNAP_ORDERS)||order.getOrderFrom().equals(OrderFromEnum.GROUP_PURCHASE_ORDERS)){
- LambdaQueryWrapper<OrderMall> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(OrderMall::getOrderId, order.getId());
- wrapper.eq(OrderMall::getDelFlag, 0);
- OrderMall orderMall= iOrderMallService.getOne(wrapper);
- R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(orderMall.getGoodsSkuId(),
+ R<GoodsSku> goodsSkuR = goodsSkuClient.getGoodsSkuOne(order.getGoodsSkuId(),
SecurityConstants.INNER);
GoodsSku goodsSku=goodsSkuR.getData();
OrderName=goodsSku.getSkuName();
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderMallServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderMallServiceImpl.java
deleted file mode 100644
index a6f5a72..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderMallServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.ruoyi.order.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.order.domain.OrderMall;
-import com.ruoyi.order.mapper.OrderMallMapper;
-import com.ruoyi.order.service.IOrderMallService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 商城订单表 服务实现类
- * </p>
- *
- * @author mitao
- * @since 2024-05-16
- */
-@Service
-public class OrderMallServiceImpl extends ServiceImpl<OrderMallMapper, OrderMall> implements IOrderMallService {
-
-}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 831b8a1..cf8ad8d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.order.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.ruoyi.common.core.constant.SecurityConstants;
@@ -8,9 +10,7 @@
import com.ruoyi.common.core.enums.PaymentMethodEnum;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.order.domain.OrderMall;
import com.ruoyi.order.mapper.OrderMapper;
-import com.ruoyi.order.service.IOrderMallService;
import com.ruoyi.order.service.IOrderService;
import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.system.api.domain.*;
@@ -40,11 +40,6 @@
*/
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
-
-
-
- @Resource
- private IOrderMallService orderMallService;
@Resource
private GoodsSkuClient goodsSkuClient;
@@ -77,6 +72,7 @@
order.setOrderTime(OrderDTO.getOrderTime());
order.setOrderFrom(OrderDTO.getOrderFrom());
order.setAuctionType(OrderDTO.getAuctionType());
+ order.setGoodsSkuId(OrderDTO.getGoodsSkuId());
order.setMemberId(OrderDTO.getMemberId());
order.setTotalAmount(OrderDTO.getTotalAmount());
order.setOrderStatus(OrderStatusEnum.TO_PLAY);
@@ -108,11 +104,7 @@
*/
@Override
public Integer getGroupPurchasesGoodsNum(Long id) {
- Set<Long> orderIdSet = orderMallService.lambdaQuery().eq(OrderMall::getActivityId, id)
- .list()
- .stream().map(OrderMall::getOrderId).collect(
- Collectors.toSet());
- List<Order> list = this.lambdaQuery().in(Order::getId, orderIdSet)
+ List<Order> list = this.lambdaQuery().eq(Order::getId, id)
.in(Order::getOrderStatus, OrderStatusEnum.TO_BE_SHIPPED,
OrderStatusEnum.GOODS_TO_BE_RECEIVED, OrderStatusEnum.FINISHED).list();
return list.stream().map(Order::getGoodsQuantity).reduce(0, Integer::sum);
@@ -237,20 +229,9 @@
}
}
-
+ order.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
baseMapper.insert(order);
- OrderMall orderMall=new OrderMall();
- orderMall.setOrderId(order.getId());
- if (memberOrderDTO.getOrderFrom()==1){
- orderMall.setGoodsSkuId(memberOrderDTO.getGoodsSkuId());
- }
- if (memberOrderDTO.getOrderFrom()==2){
- orderMall.setActivityId(memberOrderDTO.getGoodsSkuId());
- }
- if (memberOrderDTO.getOrderFrom()==3){
- orderMall.setActivityId(memberOrderDTO.getGoodsSkuId());
- }
- orderMallService.save(orderMall);
+
memberOrderVO.setId(order.getId());
memberOrderVO.setOrderStatus(OrderStatusEnum.TO_PLAY);
memberOrderVO.setOrderNo(order.getOrderNo());
@@ -347,6 +328,15 @@
CouponMemberDTO couponMemberDTO=new CouponMemberDTO();
couponMemberDTO.setId(memberOrderDTO.getCouponId());
CouponMember data = promotionClient.getCouponMember(couponMemberDTO, SecurityConstants.INNER).getData();
+
+
+ if (order.getCouponId()!=null){
+ CouponMemberDTO couponMemberDTO1=new CouponMemberDTO();
+ couponMemberDTO1.setId(memberOrderDTO.getCouponId());
+ couponMemberDTO1.setCouponStatus(1);
+ promotionClient.updCouponMember(couponMemberDTO1, SecurityConstants.INNER);
+ }
+
BigDecimal pice=new BigDecimal(0);
if (data.getCouponType().getCode()==1){
pice= order.getTotalAmount();
@@ -372,6 +362,12 @@
}
}
+ order.setCouponId(memberOrderDTO.getCouponId());
+ CouponMemberDTO couponMemberDTO2=new CouponMemberDTO();
+ couponMemberDTO2.setId(memberOrderDTO.getCouponId());
+ couponMemberDTO2.setCouponStatus(2);
+ promotionClient.updCouponMember(couponMemberDTO2, SecurityConstants.INNER);
+
order.setTotalAmount(pice);
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMallMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMallMapper.xml
deleted file mode 100644
index cd0ffb4..0000000
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMallMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.order.mapper.OrderMallMapper">
-
-</mapper>
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 598e6bd..4e8081b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -3,11 +3,9 @@
<mapper namespace="com.ruoyi.order.mapper.OrderMapper">
<select id="getSeckillMembers" resultType="java.lang.Integer">
- SELECT ifnull(count(1), 0) form t_order_mall LEFT om
- JOIN t_order o
- ON om.order_id = o.id
+ SELECT ifnull(count(1), 0) FROM t_order o
WHERE
- om.goods_sku_id = #{id}
+ o.goods_sku_id = #{id}
AND o.order_status IN (2
, 3
, 4)
@@ -18,11 +16,9 @@
<select id="getSeckillMembers1" resultType="com.ruoyi.system.api.domain.dto.MemberOrderDTO">
- SELECT ifnull(SUM(o.goods_quantity), 0) FROM t_order_mall om LEFT
- JOIN t_order o
- ON om.order_id = o.id
+ SELECT ifnull(SUM(o.goods_quantity), 0) FROM t_order o LEFT
WHERE
- om.goods_sku_id = #{goodsSkuId}
+ o.goods_sku_id = #{goodsSkuId}
AND o.order_status IN (2
, 3)
and o.member_id =#{memberId}
@@ -33,12 +29,11 @@
SELECT
o.*
FROM
- t_order_mall tom
- LEFT JOIN t_order o ON tom.order_id = o.id
+ t_order o
<where>
o.order_status = 2
AND o.order_from = 3
- AND tom.activity_id = #{id}
+ AND o.goods_sku_id = #{id}
</where>
</select>
@@ -47,10 +42,9 @@
SELECT
o.*
FROM
- t_order_mall tom
- LEFT JOIN t_order o ON tom.order_id = o.id
+ t_order o
<where>
- tom.activity_id = #{goodsSkuId}
+ o.goods_sku_id = #{goodsSkuId}
AND o.order_status = 2
AND o.order_from = 3
AND o.member_id=#{memberId}
@@ -61,11 +55,10 @@
<select id="getOrderByGroupPurchaseList" resultType="com.ruoyi.system.api.domain.vo.OrderVO">
SELECT
o.*,
- tom.activityId as goodsSkuId
+ o.goods_sku_id as goodsSkuId
FROM
- t_order_mall tom
- LEFT JOIN t_order o ON tom.order_id = o.id
- LEFT JOIN t_goods_sku tgs ON tom.activityId = tg.id
+ t_order o
+ LEFT JOIN t_goods_sku tgs ON o.goods_sku_id = tgs.id
<where>
o.order_status = 2
<if test="skuName != null and skuName != ''">
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/inner/CouponMemberController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/inner/CouponMemberController.java
index 5d002e7..6b77ac8 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/inner/CouponMemberController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/inner/CouponMemberController.java
@@ -34,4 +34,10 @@
return R.ok(iCouponMemberService.getCouponMember(couponMemberDTO));
}
+ @PostMapping("/updCouponMember")
+ public R updCouponMember(@RequestBody CouponMemberDTO couponMemberDTO) {
+ iCouponMemberService.updCouponMember(couponMemberDTO);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
index dfd712c..02b05df 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/ICouponMemberService.java
@@ -20,4 +20,7 @@
CouponMember getCouponMember(@RequestBody CouponMemberDTO couponMemberDTO);
+
+ void updCouponMember(@RequestBody CouponMemberDTO couponMemberDTO);
+
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
index 1c423a1..f50c186 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/CouponMemberServiceImpl.java
@@ -49,4 +49,11 @@
public CouponMember getCouponMember(CouponMemberDTO couponMemberDTO) {
return this.getById(couponMemberDTO.getId());
}
+
+ @Override
+ public void updCouponMember(CouponMemberDTO couponMemberDTO) {
+ CouponMember byId = this.getById(couponMemberDTO.getId());
+ byId.setCouponStatus(couponMemberDTO.getCouponStatus());
+ this.updateById(byId);
+ }
}
--
Gitblit v1.7.1