fix

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -271,6 +271,11 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     @Override
     public UserOrderVo detailApp(UserOrder param) {
         UserOrderVo userOrderVo = baseMapper.detailApp(param);
+        userOrderDetail(userOrderVo);
+        return userOrderVo;
+    }
+
+    private void userOrderDetail( UserOrderVo userOrderVo) {
         if (null != userOrderVo) {
             userOrderVo.setFeeAmt(null);
             userOrderVo.setPlantformFee(null);
@@ -285,7 +290,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             CouponOrderWrapper couponOrderWrapper  = couponInfoService.queryUserOrderCouponInfo(userOrderVo.getUserId(),
                     CouponInfoQuery.CouponOrderQuery.builder()
                             .clientType(userOrderVo.getOrderClient())
-                            .orderNo(param.getOrderNo())
+                            .orderNo(userOrderVo.getOrderNo())
                             .amount(userOrderVo.getExpectPrice().doubleValue())
                             .build());
             userOrderVo.setDiscountPrice(BigDecimal.valueOf(couponOrderWrapper.getDiscountedPrices()));
@@ -305,7 +310,6 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
             userOrderVo.setOrderDetailList(userOrderDetailVos);
         }
-        return userOrderVo;
     }
 
     @Override
@@ -713,9 +717,10 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         }
         UserOrderVo userOrderVo = baseMapper.getPendingOrder(query);
 
+
         // SVIP和VIP同时只能存在一个待支付订单
         if (null != userOrderVo) {
-            userOrderVo.setOrderDetailList(orderDetailService.getOrderDetilListByOrderNo(userOrderVo.getOrderNo()));
+            userOrderDetail(userOrderVo);
 
 
             // 查询用户下单配置

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VipCardRecordServiceImpl.java

@@ -20,6 +20,7 @@ import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.support.PageUtil;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import com.yonge.toolset.utils.date.DateUtil;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -147,20 +148,25 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
         }
 
         VipCardRecordWrapper.UserVip userVip = userVipInfo(userId, client);
+        boolean flag= false;
 
         if (userVip.getVipType() == EVipType.NOT_VIP) {
             vipCardRecord.setStartTime(new Date());
         } else if (userVip.getVipType() == EVipType.VIP && memberPriceSettings.getVipType() ==EVipType.VIP){
             vipCardRecord.setStartTime(userVip.getVipEndDate());
+            flag= true;
         } else if  (userVip.getVipType() == EVipType.VIP && memberPriceSettings.getVipType() ==EVipType.SVIP){
             vipCardRecord.setStartTime(new Date());
         }else if  (userVip.getVipType() == EVipType.SVIP && memberPriceSettings.getVipType() ==EVipType.VIP){
             if (userVip.getVipEndDate() !=null) {
+                flag= true;
                 vipCardRecord.setStartTime(userVip.getVipEndDate());
             } else {
+                flag= true;
                 vipCardRecord.setStartTime(userVip.getSvipEndDate());
             }
         }else if  (userVip.getVipType() == EVipType.SVIP && memberPriceSettings.getVipType() ==EVipType.SVIP){
+            flag= true;
             vipCardRecord.setStartTime(userVip.getSvipEndDate());
         }
         Calendar cal = Calendar.getInstance();
@@ -173,7 +179,18 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
         } else if (PeriodEnum.YEAR.getCode().equals(periodType)) {
             cal.add(Calendar.YEAR, timeNum);
         }
+
         vipCardRecord.setEndTime(cal.getTime());
+        if (flag) {
+            DateTime dateTime = DateTime.parse(DateUtil.format(vipCardRecord.getStartTime(), "yyyy-MM-dd"))
+                .plusDays(1)
+                .withHourOfDay(0)
+                .withMinuteOfHour(0)
+                .withSecondOfMinute(0)
+                .withMillisOfSecond(0);
+            vipCardRecord.setStartTime(dateTime.toDate());
+        }
+
         return vipCardRecord;
     }