激活改成伪删除

jsjp-admin/src/test/java/com/miaxis/test/NewGzptTest.java

@@ -7,6 +7,7 @@ import com.miaxis.common.utils.OrderCodeFactory;
 import com.miaxis.newgzpt.domain.GzptUserInfo;
 import com.miaxis.newgzpt.domain.GzptVideoVip;
 import com.miaxis.newgzpt.dto.GzptVideoVipDTO;
+import com.miaxis.newgzpt.service.IGzptSchActivationService;
 import com.miaxis.newgzpt.service.IGzptUserInfoService;
 import com.miaxis.newgzpt.service.IGzptVideoVipService;
 import com.miaxis.wx.domain.WxJsOrder;
@@ -38,15 +39,15 @@ public class NewGzptTest {
     @Autowired
     private IRefundRecordService refundRecordService;
 
-
+    @Autowired
+    private IGzptSchActivationService activationService;
 
 
     @Test
     public void test1() throws Exception {
-        //      List<GzptUserInfo> list = gzptUserInfoService.getList();
-
-        GzptUserInfo gzptUserInfo = gzptUserInfoService.getInfoById(69l);
-        System.out.println(gzptUserInfo);
+       // int reuslt = activationService.isSchActivation(350101318159l);
+       // System.out.println(reuslt);
+        activationService.upDelSchActivationByStuId(350101318159l);
     }
 
     @Test

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

@@ -60,7 +60,17 @@ public class GzptSchActivation implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date crtime;
 
+    @ApiModelProperty(value = "是否同步 0 未同步 1已同步")
+    @TableField("SYNC")
+    private Integer sync;
 
+    @ApiModelProperty(value = "同步时间")
+    @TableField("SYNCTIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date synctime;
 
+    @ApiModelProperty(value = "是否删除 0正常 1已删除")
+    @TableField("IS_DEL")
+    private Integer isDel;
 
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/mapper/GzptSchActivationMapper.java

@@ -20,4 +20,6 @@ public interface GzptSchActivationMapper extends BaseMapper<GzptSchActivation> {
     GzptSchActivation getSchActivation(Long stuId);
 
     void delSchActivationByStuId(Long stuId);
+
+    void upDelSchActivationByStuId(Long stuId);
 }

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

@@ -21,4 +21,6 @@ public interface IGzptSchActivationService extends IService<GzptSchActivation> {
     int isSchActivation(Long stuId);
 
     void delSchActivationByStuId(Long stuId);
+
+    void upDelSchActivationByStuId(Long stuId);
 }

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

@@ -40,7 +40,10 @@ public class GzptSchActivationServiceImpl extends ServiceImpl<GzptSchActivationM
     public int isSchActivation(Long stuId) {
         GzptSchActivation schActivation= mapper.getSchActivation(stuId);
         if(schActivation!=null){
-            return 1;
+            if(schActivation.getIsDel()!=null && schActivation.getIsDel()==0) {
+                return 1;
+            }
+            return 0;
         } else {
             return 0;
         }
@@ -50,4 +53,8 @@ public class GzptSchActivationServiceImpl extends ServiceImpl<GzptSchActivationM
     public void delSchActivationByStuId(Long stuId) {
         mapper.delSchActivationByStuId(stuId);
     }
+
+    @Override
+    public void upDelSchActivationByStuId(Long stuId) { mapper.upDelSchActivationByStuId(stuId); }
+
 }

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

@@ -1314,7 +1314,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         return orderInfoMapper.selectSchoolOrderDetailed(schoolOrderListDTO);
     }
 
-
+    /**
+     * 退款方法
+     * @param order
+     */
     public void refundOrder(WxJsOrder order) {
         long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
         Date now = new Date();
@@ -1324,7 +1327,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if ("理论实操计时".equals(order.getGoodsName())) {
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科一专项VIP(含计时)".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1340,7 +1343,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科一专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1368,7 +1371,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科二专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1396,7 +1399,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科三专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1424,7 +1427,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科四专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1489,7 +1492,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科一+科四VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1529,7 +1532,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科二+科三VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1575,7 +1578,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科二+科三+科四".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1621,7 +1624,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("科三+科四VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1674,7 +1677,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         } else if ("全科目超级VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1709,7 +1712,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                delActiva(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
             }
         }
         int isShare = schPayConfigService.isSchPayConfigByUser(userInfo);

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

@@ -5,7 +5,7 @@
 
     <insert id="saveSchActivation" parameterType="com.miaxis.newgzpt.domain.GzptSchActivation">
 
-        insert into gzpt_sch_activation (ID, DQBH, DQMC, JXBH, JXMC, USER_ID, STU_ID, CRTIME)
+        insert into gzpt_sch_activation (ID, DQBH, DQMC, JXBH, JXMC, USER_ID, STU_ID, CRTIME,SYNC,IS_DEL)
         VALUES (seq_gzpt_sch_activation.nextval,
                                              #{dqbh,jdbcType=VARCHAR},
                                              #{dqmc,jdbcType=VARCHAR},
@@ -13,10 +13,19 @@
                                              #{jxmc,jdbcType=VARCHAR},
                                              #{userId},
                                              #{stuId},
-                                             sysdate)
+                                             sysdate,
+                                             0,
+                                             0)
     </insert>
 
 
+    <update id="upDelSchActivationByStuId" parameterType="Long">
+        update gzpt_sch_activation
+        set SYNC = 0, IS_DEL = 1
+        where STU_ID = #{userId}
+    </update>
+
+
 
 
     <select id="getSchActivation" resultType="com.miaxis.newgzpt.domain.GzptSchActivation">