优化代码

java110-bean/src/main/java/com/java110/dto/couponUser/CouponUserDto.java

@@ -31,6 +31,7 @@ public class CouponUserDto extends PageDto implements Serializable {
 
     private Date createTime;
     private String endTime;
+    private String isExpire;
 
     private String statusCd = "0";
 
@@ -138,4 +139,12 @@ public class CouponUserDto extends PageDto implements Serializable {
     public void setCouponIds(String[] couponIds) {
         this.couponIds = couponIds;
     }
+
+    public String getIsExpire() {
+        return isExpire;
+    }
+
+    public void setIsExpire(String isExpire) {
+        this.isExpire = isExpire;
+    }
 }

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

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
@@ -92,6 +93,10 @@ public class CouponUserV1InnerServiceSMOImpl extends BaseServiceSMO implements I
 
             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 (ParseException e) {
                 e.printStackTrace();
             }