程远 驾校部分的合作的需求

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptSchPayLog.java

@@ -68,4 +68,9 @@ public class GzptSchPayLog implements Serializable {
     @ApiModelProperty(value = "1充值  2退款 ")
     @TableField("STATE")
     private Integer state;
+
+    @ApiModelProperty(value = "商户订单号")
+    @TableField("OUT_TRADE_NO")
+    private String outTradeNo;
+
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptUserInfo.java

@@ -150,4 +150,8 @@ public class GzptUserInfo implements Serializable {
     private String sessionKey;
 
 
+    @ApiModelProperty(value = "部分合作驾校的强执标志位")
+    @TableField("IS_SHARE")
+    private Integer isShare;
+
 }

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

@@ -38,13 +38,23 @@ public class GzptSchPayConfigServiceImpl extends ServiceImpl<GzptSchPayConfigMap
         GzptSchPayConfig schPayConfig = mapper.getSchPayConfigByJxbh(userInfo.getSchool());
         if (schPayConfig != null) { //存在合作
             if (1==schPayConfig.getIsOpen()) { // 打开合作
-                schPayConfig.getOpenTime();
                 Date bmDate = userInfo.getCrdate();
                 if (bmDate.compareTo(schPayConfig.getOpenTime()) > 0) { //当前时间大于合作时间
                     return 1;
                 } else {
                     return 0;
                 }
+            } else if(2==schPayConfig.getIsOpen()) { //部分合作
+                Date bmDate = userInfo.getCrdate();
+                if (bmDate.compareTo(schPayConfig.getOpenTime()) > 0) { //当前时间大于合作时间
+                    if(userInfo.getIsShare()!=null && 1==userInfo.getIsShare()){ //强制合作学员
+                        return 1;
+                    } else {
+                        return 0;
+                    }
+                } else {
+                    return 0;
+                }
             }
         }
         return 0;

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

@@ -1753,6 +1753,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         schPayLog.setCrtime(new Date());
         schPayLog.setState(state); // 1充值  2退款
         schPayLog.setGoodsName(order.getGoodsName());
+        schPayLog.setOutTradeNo(order.getOutTradeNo());
         schPayLogService.saveSchPayLog(schPayLog);
     }
 

jsjp-service/src/main/resources/mapper/newgzpt/GzptSchPayLogMapper.xml

@@ -4,7 +4,7 @@
 
 
     <insert id="saveSchPayLog" parameterType="com.miaxis.newgzpt.domain.GzptSchPayLog">
-        insert into GZPT_SCH_PAY_LOG (ID, STU_ID, DQBH, PRICE, JXBH, CRTIME, SYNC, SYNCTIME, STATE, GOODS_NAME) VALUES (SEQ_GZPT_SCH_PAY_LOG.nextval,
+        insert into GZPT_SCH_PAY_LOG (ID, STU_ID, DQBH, PRICE, JXBH, CRTIME, SYNC, SYNCTIME, STATE, GOODS_NAME, OUT_TRADE_NO) VALUES (SEQ_GZPT_SCH_PAY_LOG.nextval,
                                                  #{stuId},
                                                  #{dqbh,jdbcType=VARCHAR},
                                                  #{price},
@@ -13,7 +13,8 @@
                                                  0,
                                                  null,
                                                  #{state},
-                                                 #{goodsName,jdbcType=VARCHAR})
+                                                 #{goodsName,jdbcType=VARCHAR},
+                                                 #{outTradeNo,jdbcType=VARCHAR})
     </insert>