会员不返回券开始结束时间报错修改

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -320,8 +320,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 获取用户信息
         CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartInfoRequestVo.getSessionId());
         String userId = assortmentCustomerInfoVo.getMemberId();
-        String thirdPartyMemberID = assortmentCustomerInfoVo.getThirdPartyMemberID();
-        String unionId = assortmentCustomerInfoVo.getUnionId();
+//        String thirdPartyMemberID = assortmentCustomerInfoVo.getThirdPartyMemberID();
+//        String unionId = assortmentCustomerInfoVo.getUnionId();
+        String thirdPartyMemberID = "test";
+        String unionId = "test";
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String storeId = shoppingCartInfoRequestVo.getShopId();
         String appId = shoppingCartInfoRequestVo.getAppId();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -198,9 +198,10 @@ public class CouponDiscountCalculation {
 //            if (Objects.equals(memberCoupon.getCouponType(), CouponTypeEnum.TYPE_1.getCode())
 //                    || Objects.equals(memberCoupon.getCouponType(), CouponTypeEnum.TYPE_3.getCode())) {
             // 只筛选小于结束时间得券
-            if (System.currentTimeMillis() < DateUtil.convert2Date(memberCoupon.getEndTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).getTime()) {
-                couponCodes.add(memberCoupon.getCouponCode());
-            }
+//            if (System.currentTimeMillis() < DateUtil.convert2Date(memberCoupon.getEndTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).getTime()) {
+//
+//            }
+            couponCodes.add(memberCoupon.getCouponCode());
 //            }
         });
 
@@ -376,8 +377,12 @@ public class CouponDiscountCalculation {
                 // 详情
                 GetMemberCouponListResponseVo.MemberCouponDetail detail = new GetMemberCouponListResponseVo.MemberCouponDetail();
                 detail.setActivityName(memberCoupon.getCouponName());
-                String startDate = DateUtil.convert2String(DateUtil.convert2Date(memberCoupon.getStartTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
-                String endDate = DateUtil.convert2String(DateUtil.convert2Date(memberCoupon.getEndTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
+                String startDate = "";
+                String endDate = "";
+                if(memberCoupon.getStartTime() != null && memberCoupon.getEndTime() != null){
+                    startDate = DateUtil.convert2String(DateUtil.convert2Date(memberCoupon.getStartTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
+                    endDate = DateUtil.convert2String(DateUtil.convert2Date(memberCoupon.getEndTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
+                }
                 detail.setEndTime(endDate);
                 detail.setStartTime(startDate);
                 String remark = couponStateVo.getActDesc();