ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
@@ -41,7 +41,7 @@ private Integer buyNum; @ApiModelProperty(value = "优惠券id") private Long memberCouponId; private String memberCouponId; @ApiModelProperty(value = "商品售价") @JsonSerialize(using = ToStringSerializer.class) ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -264,7 +264,10 @@ goodsRealPrice = goodsTotalPrice; // 处理优惠券 if (null != memberCouponId) { appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId); appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId.toString()); System.err.println(JSON.toJSONString(appMemberCouponVoMap)); System.err.println(memberCouponId); System.err.println(JSON.toJSONString(appMemberCouponVo)); if (StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId)) { couponType = appMemberCouponVo.getCouponType(); if (couponType == 1 && appMemberCouponVo.getMoneyThreshold() != null && appMemberCouponVo.getDiscountMoney() != null) { @@ -274,7 +277,7 @@ goodsRealPrice = goodsTotalPrice.subtract(discountMoney); useCoupon = 1; userCouponIdSet.add(memberCouponId); appSureOrderGoodsVo.setMemberCouponId(memberCouponId); appSureOrderGoodsVo.setMemberCouponId(memberCouponId.toString()); } } else if (couponType == 2 && appMemberCouponVo.getDiscountPercent() != null) { discountPercent = appMemberCouponVo.getDiscountPercent(); @@ -282,7 +285,7 @@ discountMoney = goodsTotalPrice.subtract(goodsRealPrice); useCoupon = 1; userCouponIdSet.add(memberCouponId); appSureOrderGoodsVo.setMemberCouponId(memberCouponId); appSureOrderGoodsVo.setMemberCouponId(memberCouponId.toString()); } else if (couponType == 3 && appMemberCouponVo.getDiscountMoney() != null) { discountMoney = appMemberCouponVo.getDiscountMoney(); if (goodsTotalPrice.compareTo(discountMoney) > 0) { @@ -292,7 +295,7 @@ } useCoupon = 1; userCouponIdSet.add(memberCouponId); appSureOrderGoodsVo.setMemberCouponId(memberCouponId); appSureOrderGoodsVo.setMemberCouponId(memberCouponId.toString()); } } } @@ -636,7 +639,7 @@ goodsRealPrice = goodsTotalPrice; // 如果使用了优惠券，计算优惠后的价格 if (memberCouponId != null) { appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId); appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId.toString()); // 如果优惠券适用于该商品 if (StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId)) { couponType = appMemberCouponVo.getCouponType(); ruoyi-modules/ruoyi-order/src/test/java/com/ruoyi/order/orderTest.java
@@ -2,12 +2,17 @@ // //import com.baomidou.mybatisplus.extension.plugins.pagination.Page; //import com.ruoyi.common.security.utils.SecurityUtils; //import com.ruoyi.order.domain.dto.AppBuyGoodsDto; //import com.ruoyi.order.domain.dto.AppSureOrderDto; //import com.ruoyi.order.domain.dto.MerVerifyOrderDto; //import com.ruoyi.order.domain.dto.MgtShopOrderPageDto; //import com.ruoyi.order.domain.vo.AppSureOrderVo; //import com.ruoyi.order.domain.vo.MerVerifyOrderVo; //import com.ruoyi.order.domain.vo.MgtActivityOrderPageVo; //import com.ruoyi.order.service.order.OrderService; //import com.ruoyi.system.api.domain.dto.MgtBaseShopDto; //import com.ruoyi.system.api.domain.poji.member.Member; //import com.ruoyi.system.api.service.RemoteMemberService; //import org.junit.Test; //import org.junit.runner.RunWith; //import org.springframework.boot.test.context.SpringBootTest; @@ -15,6 +20,7 @@ // //import javax.annotation.Resource; //import java.math.BigDecimal; //import java.util.ArrayList; //import java.util.List; // ///** @@ -32,15 +38,28 @@ // @Resource // private OrderService orderService; // // @Resource // private RemoteMemberService memberService; // // @Test // public void main() { // MgtShopOrderPageDto mgtShopOrderPageDto = new MgtShopOrderPageDto(); // Long userId = SecurityUtils.getUserId(); // mgtShopOrderPageDto.setUserId(userId); // Page<MgtActivityOrderPageVo> page = new Page<>(); // page.setSize(Integer.MAX_VALUE); // page.setCurrent(1); // List<MgtActivityOrderPageVo> mgtActivityOrderPageVos = orderService.pageMgtActivityOrder(page,mgtShopOrderPageDto); // AppSureOrderDto appSureOrderDto = new AppSureOrderDto(); // Long userId = 1496L; // if (userId != null) { // Member member = memberService.getMember(userId).getData(); // appSureOrderDto.setUserId(userId); // if (member != null && member.getRelationShopId() != null) { // appSureOrderDto.setShopId(member.getRelationShopId()); // } // } // List<AppBuyGoodsDto> appBuyGoodsDtoList = new ArrayList<>(); // AppBuyGoodsDto appBuyGoodsDto = new AppBuyGoodsDto(); // appBuyGoodsDto.setBuyNum(1); // appBuyGoodsDto.setGoodsId("4476c539ccc54f95a1416f79a067073a"); // appBuyGoodsDto.setMemberCouponId(1766020668811378689L); // appBuyGoodsDtoList.add(appBuyGoodsDto); // appSureOrderDto.setAppBuyGoodsDtoList(appBuyGoodsDtoList); // AppSureOrderVo appSureOrderVo = orderService.buyGoods(appSureOrderDto); // // } // ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/StaffShopTaskPageVo.java
@@ -52,4 +52,7 @@ @ApiModelProperty(value = "添加用户id") private Long createUserId; @ApiModelProperty(value = "任务状态0未开始1待处理2已处理3已过期") private Integer taskStatus; } ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/ShopTaskMapper.xml
@@ -111,7 +111,8 @@ CASE WHEN tst.task_date = DATE(now()) THEN 1 ELSE 0 END todayFlag, tst.create_user_id as createUserId, tstr.user_id userId, tstr.create_time followTime tstr.create_time followTime, tst.task_status as taskStatus FROM t_shop_task tst LEFT JOIN t_shop_task_record tstr ON tstr.task_id = tst.task_id AND tstr.id = (SELECT MAX(id) FROM t_shop_task_record WHERE task_id = tst.task_id) WHERE tst.del_flag = 0 AND tst.shop_id = #{param.shopId}
