fixed 卡券有效期问题

fuint-application/src/main/java/com/fuint/common/service/SettingService.java

@@ -62,4 +62,5 @@ public interface SettingService extends IService<MtSetting> {
      * @return
      * */
     List<ParamDto> getPayTypeList(String platform);
+
 }

fuint-application/src/main/java/com/fuint/common/service/WeixinService.java

@@ -26,7 +26,7 @@ public interface WeixinService {
      * @param useCache 是否从缓存中读取
      * @return
      * */
-    String getAccessToken(Integer merchantId, boolean useCache) throws BusinessCheckException ;
+    String getAccessToken(Integer merchantId, boolean useCache) throws BusinessCheckException;
 
     /**
      * 提交预支付订单

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientUserCouponController.java

@@ -164,13 +164,13 @@ public class ClientUserCouponController extends BaseController {
             result.setCouponId(couponInfo.getId());
             result.setType(couponInfo.getType());
             result.setUseRule(couponInfo.getOutRule());
+            String effectiveDate;
             if (couponInfo.getExpireType().equals(CouponExpireTypeEnum.FIX.getKey())) {
-                String effectiveDate = DateUtil.formatDate(couponInfo.getBeginTime(), "yyyy.MM.dd HH:mm") + " - " + DateUtil.formatDate(couponInfo.getEndTime(), "yyyy.MM.dd HH:mm");
-                result.setEffectiveDate(effectiveDate);
+                effectiveDate = DateUtil.formatDate(couponInfo.getEndTime(), "yyyy.MM.dd HH:mm");
             } else {
-                String effectiveDate = DateUtil.formatDate(userCoupon.getCreateTime(), "yyyy.MM.dd HH:mm") + " - " + DateUtil.formatDate(userCoupon.getExpireTime(), "yyyy.MM.dd HH:mm");
-                result.setEffectiveDate(effectiveDate);
+                effectiveDate = DateUtil.formatDate(userCoupon.getExpireTime(), "yyyy.MM.dd HH:mm");
             }
+            result.setEffectiveDate(effectiveDate);
             result.setCode(userCoupon.getCode());
             result.setAmount(userCoupon.getAmount());
             result.setBalance(userCoupon.getBalance());