考场修改

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -13,6 +13,7 @@ import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.uuid.CommonUtils;
 import com.miaxis.exam.domain.ExamInfo;
 import com.miaxis.exam.service.IExamInfoService;
+import com.miaxis.examvip.domain.VipUserExam;
 import com.miaxis.examvip.service.IVipUserExamService;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.service.IGzptSchActivationService;
@@ -47,6 +48,7 @@ import java.io.File;
 import java.security.PrivateKey;
 import java.security.Signature;
 import java.util.Base64;
+import java.util.Date;
 
 import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
 
@@ -166,9 +168,13 @@ public class WxJsjpController extends BaseController {
         if(wxOrderGoodsDTO.getGoodsType()==2) {
             GzptUserInfo gzptUserInfo = userInfoService.getInfoById(wxOrderGoodsDTO.getUserId());
 
-            int count = vipUserExamService.getUserExamCountByUserIdAndGoodsId(wxOrderGoodsDTO.getUserId(), wxOrderGoodsDTO.getGoodsId());
-            if (count > 0) {
-                throw new CustomException("您已购买过该考场，退回上个页面，重新进入。");
+            VipUserExam vipUserExam = vipUserExamService.getUserExamByUserIdAndGoodsId(wxOrderGoodsDTO.getUserId(), wxOrderGoodsDTO.getGoodsId());
+            if (vipUserExam != null) {
+                Date expirationTime = vipUserExam.getExpirationTime();
+                Date now = new Date();
+                if (expirationTime != null && now.compareTo(expirationTime)>=0) {
+                    throw new CustomException("您已购买过该考场，退回上个页面，重新进入。");
+                }
             }
             ExamInfo examInfo = examInfoService.getById(wxOrderGoodsDTO.getGoodsId());
             //创建本地微信订单

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -906,6 +906,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
     @Override
     public void writeExamDataToDb(WxJsOrder order, int payType) {
+        System.out.println("writeExamDataToDb");
         long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
         Date now = new Date();
         OrderInfo orderInfo = new OrderInfo();