zoujiajian 2 лет назад
Родитель
Сommit
d5b358958c

+ 2 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/ChatgptUser.java

@@ -1,5 +1,6 @@
 package com.cyksj.model.entity;
 package com.cyksj.model.entity;
 
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ejlchina.searcher.bean.SearchBean;
 import com.ejlchina.searcher.bean.SearchBean;
@@ -84,5 +85,6 @@ public class ChatgptUser extends BaseEntity {
     /**
     /**
      * 清洗套餐包时间
      * 清洗套餐包时间
      */
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date clearPackageTime;
     private Date clearPackageTime;
 }
 }

+ 8 - 1
netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -450,10 +450,17 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                     gptLimitTime = secondUpgrade.getTime();
                     gptLimitTime = secondUpgrade.getTime();
                     gptLimitNum = secondUpgrade.getNum();
                     gptLimitNum = secondUpgrade.getNum();
                 }
                 }
-
+                Long packageId = 0l;
+                //降级套餐
+                if (secondUpgrade != null) {
+                    packageId = secondUpgrade.getPackageId();
+                }
                 int update = chatgptUserMapper.update(null, Wrappers.lambdaUpdate(ChatgptUser.class)
                 int update = chatgptUserMapper.update(null, Wrappers.lambdaUpdate(ChatgptUser.class)
                         .set(ChatgptUser::getLimitTime, gptLimitTime)
                         .set(ChatgptUser::getLimitTime, gptLimitTime)
                         .set(ChatgptUser::getLimitNum, gptLimitNum)
                         .set(ChatgptUser::getLimitNum, gptLimitNum)
+                        .set(ChatgptUser::getPackageId, packageId)
+                        //无次等套餐 不需要清除套餐时间
+                        .set(secondUpgrade == null, ChatgptUser::getClearPackageTime, null)
                         .eq(ChatgptUser::getId, chatgptUser.getId()));
                         .eq(ChatgptUser::getId, chatgptUser.getId()));
                 if (update == 0) {
                 if (update == 0) {
                     log.info("chatgptUser 升级套餐包增值失败 id:{},orderId:{}", chatgptUser.getId(), orderDon.getId());
                     log.info("chatgptUser 升级套餐包增值失败 id:{},orderId:{}", chatgptUser.getId(), orderDon.getId());