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/service/business/impl/MemberCouponServiceImpl.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

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 f146ea2..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
@@ -70,24 +70,25 @@
 
     @Override
     @Transactional(rollbackFor = {BusinessException.class,Exception.class})
-    public    String addBatch(MemberCouponAddDTO memberCoupon){
-        checkAddBatchParamValid(memberCoupon);
+    public    String addBatch(MemberCouponAddDTO memberCouponAddDTO){
+        checkAddBatchParamValid(memberCouponAddDTO);
 
-        List<Coupon> couponList = getCouponListByParam(memberCoupon);
-        List<Member> memberList = getMemberListByParam(memberCoupon);
+        List<Coupon> couponList = getCouponListByParam(memberCouponAddDTO);
+        List<Member> memberList = getMemberListByParam(memberCouponAddDTO);
         List<MemberCoupon>  addList = new ArrayList<>();
         int index =1;
         LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
         Date now = new Date();
-        for(Coupon param  : memberCoupon.getAddCouponList()){
+        for(Coupon param  : memberCouponAddDTO.getAddCouponList()){
             Coupon  coupon = getCouponFromListById(param.getId(),couponList);
             if(coupon == null){
                 throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗��"+index+"銆戜釜浼樻儬鍒告煡璇㈡棤鏁堬紝璇峰埛鏂伴〉闈㈤噸鏂帮紒");
             }
             for(Member member : memberList){
                 for (int i = 0; i < Constants.formatLongNum(param.getNum()); i++) {
+                    MemberCoupon memberCoupon = MemberCoupon.couponToBean(coupon,member,now,Constants.TWO,loginUserInfo);
                     //鎸ㄤ釜閫�
-                    addList.add(initMemberCouponByParam(coupon,member,loginUserInfo,now));
+                    addList.add(memberCoupon);
                 }
             }
             index++;
@@ -97,8 +98,8 @@
             memberCouponMapper.insert(addList);
         }
         return "鎿嶄綔鎴愬姛,鎴愬姛浜哄憳鏁伴噺锛�"+memberList.size()+",鍏卞彂鏀句紭鎯犲埜鏁伴噺锛�"+addList.size();
-
     }
+/*
 
     private MemberCoupon initMemberCouponByParam(Coupon coupon, Member member, LoginUserInfo loginUserInfo ,Date now) {
         MemberCoupon insert = new MemberCoupon();
@@ -134,6 +135,7 @@
         insert.setCouponId(coupon.getId());
         return  insert;
     }
+*/
 
     private Coupon getCouponFromListById(Integer id, List<Coupon> couponList) {
         for(Coupon c : couponList){
@@ -378,7 +380,7 @@
                 .apply(Objects.nonNull(status)&&Constants.equalsInteger(status,Constants.TWO),"m.STATUS = 0 and  m.END_DATE < now() " )
                 .eq("TYPE",couponType)
                 .apply(!Objects.isNull(price)," m.LIMIT_PRICE >= "+price+" ")
-                .apply("   now() between m.START_DATE and m.END_DATE ")
+//                .apply("   now() between m.START_DATE and m.END_DATE ")
                 .orderByDesc(" m.PRICE ")
         );
         return page;
@@ -518,10 +520,7 @@
         memberCoupon.setBackIntegral(BigDecimal.ZERO);
         memberCoupon.setName(coupon.getName());
         memberCouponMapper.insert(memberCoupon);
-        //TODO 娣诲姞绉垎鍙樺姩璁板綍
 
-        //鏇存柊鐢ㄦ埛绉垎
-        memberMapper.subtractIntegral(memberId,memberCoupon.getIntegral());
     }
 
 
@@ -542,6 +541,7 @@
         //鏌ヨ鍟嗗搧鍒楄〃
         List<Goods> goodsList = goodsMapper.selectJoinList(Goods.class,
                 new MPJLambdaWrapper<Goods>()
+                        .selectAll(Goods.class)
                         .selectAs(GoodsSku::getPrice,Goods::getSkuPrice)
                         .selectAs(GoodsSku::getId,Goods::getSkuId)
                         .leftJoin(GoodsSku.class,GoodsSku::getGoodsId,Goods::getId)

--
Gitblit v1.9.3