订单表添加查询

jsjp-admin/src/main/java/com/miaxis/app/controller/gzpt/GzptUserInfoController.java

@@ -79,7 +79,7 @@ public class GzptUserInfoController extends BaseController {
         int isActiva = 0;
         GzptUserInfo gzptUserInfo = userInfoService.getInfoById(gzptVideoVipDTO.getUserId());
         //获取合作驾校配置表
-        isShare = schPayConfigService.isSchPayConfigByJxbh(gzptUserInfo.getSchool());
+        isShare = schPayConfigService.isSchPayConfigByUser(gzptUserInfo);
         //如果是合作驾校，查询激活状态
         if(isShare==1) {
             isActiva = schActivationService.isSchActivation(gzptUserInfo.getOutId());

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

@@ -103,7 +103,7 @@ public class WxJsjpController extends BaseController {
         WxJsOrder order = new WxJsOrder();
         GzptUserInfo gzptUserInfo = userInfoService.getInfoById(wxOrderDTO.getUserId());
         //获取合作驾校配置表
-        isShare = schPayConfigService.isSchPayConfigByJxbh(gzptUserInfo.getSchool());
+        isShare = schPayConfigService.isSchPayConfigByUser(gzptUserInfo);
 
         String orderCode = getOrderCode(gzptUserInfo.getId());
         order.setOutTradeNo(orderCode);

jsjp-service/src/main/java/com/miaxis/newgzpt/service/IGzptSchPayConfigService.java

@@ -14,6 +14,7 @@ import com.miaxis.newgzpt.domain.GzptUserInfo;
 public interface IGzptSchPayConfigService extends IService<GzptSchPayConfig> {
 
 
-    int isSchPayConfigByJxbh(String jxbh);
+    int isSchPayConfigByUser(GzptUserInfo userInfo);
+
 
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/service/impl/GzptSchPayConfigServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.annotation.DataSource;
 import com.miaxis.common.enums.DataSourceTypeEnum;
 import com.miaxis.newgzpt.domain.GzptSchPayConfig;
+import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.mapper.GzptSchPayConfigMapper;
 import com.miaxis.newgzpt.service.IGzptSchPayConfigService;
 import org.springframework.stereotype.Service;
@@ -30,13 +31,13 @@ public class GzptSchPayConfigServiceImpl extends ServiceImpl<GzptSchPayConfigMap
 
 
     @Override
-    public int isSchPayConfigByJxbh(String jxbh) {
-        GzptSchPayConfig schPayConfig = mapper.getSchPayConfigByJxbh(jxbh);
+    public int isSchPayConfigByUser(GzptUserInfo userInfo) {
+        GzptSchPayConfig schPayConfig = mapper.getSchPayConfigByJxbh(userInfo.getSchool());
         if (schPayConfig != null) { //存在合作
             if ("1".equals(schPayConfig.getIsOpen())) { // 打开合作
                 schPayConfig.getOpenTime();
-                Date now = new Date();
-                if (now.compareTo(schPayConfig.getOpenTime()) > 0) { //当前时间大于合作时间
+                Date bmDate = userInfo.getCrdate();
+                if (bmDate.compareTo(schPayConfig.getOpenTime()) > 0) { //当前时间大于合作时间
                     return 1;
                 } else {
                     return 0;

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

@@ -875,7 +875,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
         }
         //如果是合作驾校插入消费记录表
-        int isShare = schPayConfigService.isSchPayConfigByJxbh(userInfo.getSchool());
+        int isShare = schPayConfigService.isSchPayConfigByUser(userInfo);
         if (isShare == 1) {
             savePayLog(order, userInfo,1);
         }
@@ -1712,7 +1712,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 delActiva(userInfo.getOutId());
             }
         }
-        int isShare = schPayConfigService.isSchPayConfigByJxbh(userInfo.getSchool());
+        int isShare = schPayConfigService.isSchPayConfigByUser(userInfo);
         if (isShare == 1) {
             //如果是合作驾校插入消费记录表
             savePayLog(order, userInfo,2);