From cbe044eba8ed473727dd0a0601d8b88ad2b6f417 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 27 二月 2026 16:04:18 +0800
Subject: [PATCH] 小程序   接口开发

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java                   |    3 ++-
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java   |    7 -------
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java |    7 -------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java
index ff110ae..4caf5cb 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/ShopcartMapper.java
@@ -13,7 +13,8 @@
  */
 public interface ShopcartMapper extends BaseMapper<Shopcart> {
 
-    @Select(" select s.id as shopCartId , s.GOODS_SKU_ID  as goodsSkuId  , s.PRODUCT_ID as goodsId , g.name as goodsName , gs.`NAME` as skuName , s.num , gs.PRICE  , ifnull(gs.STATUS,1) as status ," +
+    @Select(" select s.id as shopCartId , s.GOODS_SKU_ID  as goodsSkuId  , s.PRODUCT_ID as goodsId , g.name as goodsName , gs.`NAME` as skuName , s.num , gs.PRICE  ," +
+            " CASE WHEN ( g.ISDELETED = 1 || g.`STATUS` = 1 || gs.ISDELETED = 1  ) THEN 1 ELSE 0 END status," +
             "case when gs.IMGURL = ''  then g.IMGURL  when gs.IMGURL is null then  g.IMGURL  else gs.IMGURL end imgUrl  " +
             " from shopcart s left join goods g on s.PRODUCT_ID = g.ID left join goods_sku gs ON s.GOODS_SKU_ID = gs.id " +
             "  where 1 = 1 and s.member_id = #{memberId} order by s.CREATE_DATE desc ")
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index c2d91d5..e3ce6ca 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -1705,13 +1705,6 @@
                     continue;
                 }
                 MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,inviteMember,new Date(),Constants.ONE,null);
-                if(Constants.equalsInteger(memberCoupon.getCouponType(),Constants.ZERO)){
-                    memberCoupon.setMaxPrice(memberCoupon.getPrice());
-                }else if(Constants.equalsInteger(memberCoupon.getCouponType(),Constants.ONE)){
-                    memberCoupon.setMaxPrice(memberCoupon.getLimitPrice().subtract(memberCoupon.getLimitPrice().multiply(memberCoupon.getPrice()).divide(new BigDecimal("100"),2, RoundingMode.HALF_UP)));
-                }else{
-                    memberCoupon.setMaxPrice(BigDecimal.ZERO);
-                }
                 for (int i = 0; i < num; i++) {
                     memberCouponList.add(memberCoupon);
                 }
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
index 38b728b..bcfc15b 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java
@@ -84,16 +84,9 @@
             if(coupon == null){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+index+"銆戜釜浼樻儬鍒告煡璇㈡棤鏁堬紝璇峰埛鏂伴〉闈㈤噸鏂帮紒");
             }
-            BigDecimal maxPrice = BigDecimal.ZERO;
-            if(Constants.equalsInteger(coupon.getCouponType(),Constants.ZERO)){
-                maxPrice = coupon.getPrice();
-            }else if(Constants.equalsInteger(coupon.getCouponType(),Constants.ONE)){
-                maxPrice = coupon.getLimitPrice().subtract(coupon.getLimitPrice().multiply(coupon.getPrice()).divide(new BigDecimal("100"),2, RoundingMode.HALF_UP));
-            }
             for(Member member : memberList){
                 for (int i = 0; i < Constants.formatLongNum(param.getNum()); i++) {
                     MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,member,now,Constants.TWO,loginUserInfo);
-                    memberCoupon.setMaxPrice(maxPrice);
                     //鎸ㄤ釜閫�
                     addList.add(memberCoupon);
                 }

--
Gitblit v1.9.3