删除激活操作BUG修改

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

@@ -238,229 +238,6 @@ public class WxNotifyController {
 
 
 
-
-
-    @Transactional
-    public void writeVipDataToDb(WxJsOrder wxJsOrder) {
-        long oneYearLong = 1000 * 60 * 60 * 24 * 365l;
-        Date now = new Date();
-        OrderInfo orderInfo = new OrderInfo();
-        orderInfo.setGoodsName(wxJsOrder.getGoodsName());
-        orderInfo.setUserId(wxJsOrder.getUserId());
-        orderInfo.setOutTradeNo(wxJsOrder.getOutTradeNo());
-        orderInfo.setTotal(wxJsOrder.getTotal());
-        orderInfo.setTradeType(1);
-        orderInfo.setSuccessTime(wxJsOrder.getSuccessTime());
-        orderInfo.setPayType(1);
-
-
-        if ("科一专项VIP".equals(wxJsOrder.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                if (km1Date != null) {  //存在会员时间
-                    if (km1Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km1oneYear = new Date(x);
-                        userVip.setSubject1(km1oneYear);
-                    } else {  //会员时间延长
-                        long x = km1Date.getTime() + oneYearLong;
-                        Date km1oneYear = new Date(x);
-                        userVip.setSubject1(km1oneYear);
-                    }
-                    userVipService.updateById(userVip);
-                    orderInfoService.save(orderInfo);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                    userVipService.updateById(userVip);
-                    orderInfoService.save(orderInfo);
-                }
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(wxJsOrder.getUserId());
-                uv.setUserName(wxJsOrder.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date km1oneYear = new Date(x);
-                uv.setSubject1(km1oneYear);
-                userVipService.save(uv);
-                orderInfoService.save(orderInfo);
-            }
-
-        } else if ("科二专项VIP".equals(wxJsOrder.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km2Date = userVip.getSubject2();
-                if (km2Date != null) {  //存在会员时间
-                    if (km2Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km2oneYear = new Date(x);
-                        userVip.setSubject2(km2oneYear);
-                    } else {  //会员时间延长
-                        long x = km2Date.getTime() + oneYearLong;
-                        Date km2oneYear = new Date(x);
-                        userVip.setSubject2(km2oneYear);
-                    }
-                    userVipService.updateById(userVip);
-                    orderInfoService.save(orderInfo);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                    userVipService.updateById(userVip);
-                    orderInfoService.save(orderInfo);
-                }
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(wxJsOrder.getUserId());
-                uv.setUserName(wxJsOrder.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date km2oneYear = new Date(x);
-                uv.setSubject2(km2oneYear);
-                userVipService.save(uv);
-                orderInfoService.save(orderInfo);
-            }
-        } else if ("科三专项VIP".equals(wxJsOrder.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km3Date = userVip.getSubject3();
-                if (km3Date != null) {  //存在会员时间
-                    if (km3Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km3oneYear = new Date(x);
-                        userVip.setSubject3(km3oneYear);
-                    } else {  //会员时间延长
-                        long x = km3Date.getTime() + oneYearLong;
-                        Date km3oneYear = new Date(x);
-                        userVip.setSubject3(km3oneYear);
-                    }
-                    userVipService.updateById(userVip);
-                    orderInfoService.save(orderInfo);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                    userVipService.updateById(userVip);
-                    orderInfoService.save(orderInfo);
-                }
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(wxJsOrder.getUserId());
-                uv.setUserName(wxJsOrder.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date km3oneYear = new Date(x);
-                uv.setSubject3(km3oneYear);
-                userVipService.save(uv);
-                orderInfoService.save(orderInfo);
-            }
-
-        } else if ("科四专项VIP".equals(wxJsOrder.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km4Date = userVip.getSubject4();
-                if (km4Date != null) {  //存在会员时间
-                    if (km4Date.compareTo(now) < 0) {  //会员已过期
-                        long x = now.getTime() + oneYearLong;
-                        Date km4oneYear = new Date(x);
-                        userVip.setSubject4(km4oneYear);
-                    } else {  //会员时间延长
-                        long x = km4Date.getTime() + oneYearLong;
-                        Date km4oneYear = new Date(x);
-                        userVip.setSubject4(km4oneYear);
-                    }
-                    userVipService.updateById(userVip);
-                    orderInfoService.save(orderInfo);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                    userVipService.updateById(userVip);
-                    orderInfoService.save(orderInfo);
-                }
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(wxJsOrder.getUserId());
-                uv.setUserName(wxJsOrder.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date km4oneYear = new Date(x);
-                uv.setSubject4(km4oneYear);
-                userVipService.save(uv);
-                orderInfoService.save(orderInfo);
-            }
-
-        } else if ("科目一二三四所有付费权益".equals(wxJsOrder.getGoodsName())) {
-            UserVip userVip = userVipService.getUserVipByUserId(wxJsOrder.getUserId());
-            if (userVip != null) {
-                //修改会员信息
-                Date km1Date = userVip.getSubject1();
-                Date km2Date = userVip.getSubject2();
-                Date km3Date = userVip.getSubject3();
-                Date km4Date = userVip.getSubject4();
-                if (km1Date != null) { //科目一处理
-                    long x = km1Date.getTime() + oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km1oneYear = new Date(x);
-                    userVip.setSubject1(km1oneYear);
-                }
-                if (km2Date != null) { //科目二处理
-                    long x = km2Date.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km2oneYear = new Date(x);
-                    userVip.setSubject2(km2oneYear);
-                }
-                if (km3Date != null) { //科目三处理
-                    long x = km3Date.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km3oneYear = new Date(x);
-                    userVip.setSubject3(km3oneYear);
-                }
-                if (km4Date != null) { //科目四处理
-                    long x = km4Date.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                } else {
-                    long x = now.getTime() + oneYearLong;
-                    Date km4oneYear = new Date(x);
-                    userVip.setSubject4(km4oneYear);
-                }
-                userVipService.updateById(userVip);
-                orderInfoService.save(orderInfo);
-            } else {
-                //新增会员信息
-                UserVip uv = new UserVip();
-                uv.setUserId(wxJsOrder.getUserId());
-                uv.setUserName(wxJsOrder.getUserName());
-                long x = now.getTime() + oneYearLong;
-                Date oneYear = new Date(x);
-                uv.setSubject1(oneYear);
-                uv.setSubject2(oneYear);
-                uv.setSubject3(oneYear);
-                uv.setSubject4(oneYear);
-                userVipService.save(uv);
-                orderInfoService.save(orderInfo);
-            }
-        }
-    }
-
-
     private String getSourString(WxpayNotifyDTO wxpayNotifyDTO) throws GeneralSecurityException, IOException {
         AesUtil aesUtil = new AesUtil(wxpayConfig.getV3key().getBytes());
         WxpayNotifyDTO.WxpaySource wxpaySource = wxpayNotifyDTO.getResource();

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

@@ -47,7 +47,7 @@ public class NewGzptTest {
     public void test1() throws Exception {
        // int reuslt = activationService.isSchActivation(350101318159l);
        // System.out.println(reuslt);
-        activationService.upDelSchActivationByStuId(350101318159l);
+        activationService.upDelSchActivationByStuId(350101318159l,0);
     }
 
     @Test

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

@@ -3,6 +3,7 @@ package com.miaxis.newgzpt.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.newgzpt.domain.GzptSchActivation;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -21,5 +22,5 @@ public interface GzptSchActivationMapper extends BaseMapper<GzptSchActivation> {
 
     void delSchActivationByStuId(Long stuId);
 
-    void upDelSchActivationByStuId(Long stuId);
+    void upDelSchActivationByStuId(@Param("stuId")Long stuId,@Param("state")Integer state);
 }

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

@@ -24,7 +24,7 @@ public interface IGzptSchActivationService extends IService<GzptSchActivation> {
 
     void delSchActivationByStuId(Long stuId);
 
-    void upDelSchActivationByStuId(Long stuId);
+    void upDelSchActivationByStuId(Long stuId,Integer state);
 
     List<GzptSchActivation> selectSchActivationList(GzptSchActivationDTO gzptSchActivationDTO);
 }

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

@@ -43,6 +43,8 @@ public class GzptSchActivationServiceImpl extends ServiceImpl<GzptSchActivationM
         if(schActivation!=null){
             if(schActivation.getIsDel()!=null && schActivation.getIsDel()==0) {
                 return 1;
+            } else if (schActivation.getIsDel()!=null && schActivation.getIsDel()==1) {
+                return 2;
             }
             return 0;
         } else {
@@ -56,7 +58,7 @@ public class GzptSchActivationServiceImpl extends ServiceImpl<GzptSchActivationM
     }
 
     @Override
-    public void upDelSchActivationByStuId(Long stuId) { mapper.upDelSchActivationByStuId(stuId); }
+    public void upDelSchActivationByStuId(Long stuId,Integer state) { mapper.upDelSchActivationByStuId(stuId,state); }
 
     @Override
     public List<GzptSchActivation> selectSchActivationList(GzptSchActivationDTO gzptSchActivationDTO) {

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

@@ -93,9 +93,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         int isActiva = schActivationService.isSchActivation(userInfo.getOutId());
         if ("理论实操计时".equals(order.getGoodsName())) {
             //激活操作
-            if(isActiva!=1) {
+            if(isActiva==0) {  //未激活
                 saveActiva(order, userInfo);
                 this.save(orderInfo);
+            } else if (isActiva==2) {  //激活过，退款
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),0);
             }
         } else if ("科一专项VIP(含计时)".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1334,7 +1336,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if ("理论实操计时".equals(order.getGoodsName())) {
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科一专项VIP(含计时)".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1350,7 +1352,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科一专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1378,7 +1380,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科二专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1406,7 +1408,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科三专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1434,7 +1436,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科四专项VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1499,7 +1501,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科一+科四VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1539,7 +1541,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科二+科三VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1585,7 +1587,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科二+科三+科四".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1631,7 +1633,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("科三+科四VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1684,7 +1686,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         } else if ("全科目超级VIP".equals(order.getGoodsName())) {
             UserVip userVip = userVipService.getUserVipByUserId(order.getUserId());
@@ -1719,7 +1721,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             }
             //删除激活
             if(isActiva==1) {
-                schActivationService.upDelSchActivationByStuId(userInfo.getOutId());
+                schActivationService.upDelSchActivationByStuId(userInfo.getOutId(),1);
             }
         }
         int isShare = schPayConfigService.isSchPayConfigByUser(userInfo);

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

@@ -19,15 +19,16 @@
     </insert>
 
 
-    <update id="upDelSchActivationByStuId" parameterType="Long">
+    <update id="upDelSchActivationByStuId" >
         update gzpt_sch_activation
-        set SYNC = 0, IS_DEL = 1
-        where STU_ID = #{userId}
+        set SYNC = 0, IS_DEL = #{state}
+        where STU_ID = #{stuId}
     </update>
 
 
 
 
+
     <select id="getSchActivation" resultType="com.miaxis.newgzpt.domain.GzptSchActivation">
         select * from GZPT_SCH_ACTIVATION where STU_ID = #{stuId}
     </select>