加入优惠券 有效期

java110-bean/src/main/java/com/java110/dto/couponPropertyUser/CouponPropertyUserDto.java

@@ -32,6 +32,9 @@ public class CouponPropertyUserDto extends PageDto implements Serializable {
     private String communityId;
     private String value;
 
+    private String endTime;
+    private String isExpire;
+
 
     private Date createTime;
 
@@ -159,4 +162,20 @@ public class CouponPropertyUserDto extends PageDto implements Serializable {
     public void setToTypeName(String toTypeName) {
         this.toTypeName = toTypeName;
     }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getIsExpire() {
+        return isExpire;
+    }
+
+    public void setIsExpire(String isExpire) {
+        this.isExpire = isExpire;
+    }
 }

service-acct/src/main/java/com/java110/acct/smo/impl/CouponPropertyUserV1InnerServiceSMOImpl.java

@@ -17,6 +17,7 @@ package com.java110.acct.smo.impl;
 
 
 import com.java110.acct.dao.ICouponPropertyUserV1ServiceDao;
+import com.java110.dto.couponUser.CouponUserDto;
 import com.java110.intf.acct.ICouponPropertyUserV1InnerServiceSMO;
 import com.java110.dto.couponPropertyUser.CouponPropertyUserDto;
 import com.java110.po.couponPropertyUser.CouponPropertyUserPo;
@@ -24,6 +25,7 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.user.UserDto;
 import com.java110.dto.PageDto;
+import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -77,11 +79,33 @@ public class CouponPropertyUserV1InnerServiceSMOImpl extends BaseServiceSMO impl
         }
 
         List<CouponPropertyUserDto> couponPropertyUsers = BeanConvertUtil.covertBeanList(couponPropertyUserV1ServiceDaoImpl.getCouponPropertyUserInfo(BeanConvertUtil.beanCovertMap(couponPropertyUserDto)), CouponPropertyUserDto.class);
-
+        resfEndTime(couponPropertyUsers);
         return couponPropertyUsers;
     }
 
 
+    private void resfEndTime(List<CouponPropertyUserDto> couponUsers) {
+        if (couponUsers == null || couponUsers.size() < 1) {
+            return;
+        }
+
+        for (CouponPropertyUserDto couponUser : couponUsers) {
+
+            try {
+                couponUser.setEndTime(DateUtil.getAddDayString(couponUser.getCreateTime(),DateUtil.DATE_FORMATE_STRING_B,Integer.parseInt(couponUser.getValidityDay())));
+                //不计算已过期购物券金额
+                if (couponUser.getEndTime().compareTo(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B)) >= 0) {
+                    couponUser.setIsExpire("Y");
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+
+    }
+
+
     @Override
     public int queryCouponPropertyUsersCount(@RequestBody CouponPropertyUserDto couponPropertyUserDto) {
         return couponPropertyUserV1ServiceDaoImpl.queryCouponPropertyUsersCount(BeanConvertUtil.beanCovertMap(couponPropertyUserDto));    }

service-job/src/main/java/com/java110/job/adapt/payment/coupon/PayFeeGiftCouponAdapt.java

@@ -256,14 +256,14 @@ public class PayFeeGiftCouponAdapt extends DatabusAdaptImpl {
             couponPropertyPoolV1InnerServiceSMOImpl.updateCouponPropertyPool(couponPropertyPoolPo);
 
             //用户账户写入优惠券
-            CouponPropertyUserDto couponPropertyUserDto = new CouponPropertyUserDto();
-            couponPropertyUserDto.setTel(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_OWNER_LINK));
-            couponPropertyUserDto.setCommunityId(couponPropertyPoolDtos.get(0).getCommunityId());
-            couponPropertyUserDto.setCppId(couponPropertyPoolDtos.get(0).getCppId());
-
-            List<CouponPropertyUserDto> couponPropertyUserDtos = couponPropertyUserV1InnerServiceSMOImpl.queryCouponPropertyUsers(couponPropertyUserDto);
+//            CouponPropertyUserDto couponPropertyUserDto = new CouponPropertyUserDto();
+//            couponPropertyUserDto.setTel(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_OWNER_LINK));
+//            couponPropertyUserDto.setCommunityId(couponPropertyPoolDtos.get(0).getCommunityId());
+//            couponPropertyUserDto.setCppId(couponPropertyPoolDtos.get(0).getCppId());
+//
+//            List<CouponPropertyUserDto> couponPropertyUserDtos = couponPropertyUserV1InnerServiceSMOImpl.queryCouponPropertyUsers(couponPropertyUserDto);
             CouponPropertyUserPo couponPropertyUserPo = new CouponPropertyUserPo();
-            if(couponPropertyUserDtos == null || couponPropertyUserDtos.size()< 1){
+//            if(couponPropertyUserDtos == null || couponPropertyUserDtos.size()< 1){
                 couponPropertyUserPo.setCommunityId(couponPropertyPoolDtos.get(0).getCommunityId());
                 couponPropertyUserPo.setCppId(couponPropertyPoolDtos.get(0).getCppId());
                 couponPropertyUserPo.setState(CouponPropertyUserDto.STATE_WAIT);
@@ -277,12 +277,13 @@ public class PayFeeGiftCouponAdapt extends DatabusAdaptImpl {
                 couponPropertyUserPo.setTel(FeeAttrDto.getFeeAttrValue(feeDto, FeeAttrDto.SPEC_CD_OWNER_LINK));
                 couponPropertyUserPo.setValue(value);
                 couponPropertyUserV1InnerServiceSMOImpl.saveCouponPropertyUser(couponPropertyUserPo);
-            }else{
-                couponPropertyUserPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());
-                int userStock = Integer.parseInt(couponPropertyUserDtos.get(0).getStock());
-                couponPropertyUserPo.setStock((quantity+userStock)+"");
-                couponPropertyUserV1InnerServiceSMOImpl.updateCouponPropertyUser(couponPropertyUserPo);
-            }
+                //这里更新功能 关闭 因为优惠券有有效期 如果 修改显然不合适 modify by  2022-11-24 wuxw
+//            }else{
+//                couponPropertyUserPo.setCouponId(couponPropertyUserDtos.get(0).getCouponId());
+//                int userStock = Integer.parseInt(couponPropertyUserDtos.get(0).getStock());
+//                couponPropertyUserPo.setStock((quantity+userStock)+"");
+//                couponPropertyUserV1InnerServiceSMOImpl.updateCouponPropertyUser(couponPropertyUserPo);
+//            }
 
 
         } finally {