fix

netflix-dao/src/main/java/com/cyksj/model/entity/MidjourneyUser.java

@@ -43,12 +43,12 @@ public class MidjourneyUser extends BaseEntity{
     /**
      * mj fast次数
      */
-    private Integer mjFastNum;
+    private Long mjFastNum;
 
     /**
      * mj relax次数
      */
-    private Integer mjRelaxNum;
+    private Long mjRelaxNum;
 
     /**
      * 当前模式 1:fast 2:relax

netflix-dao/src/main/java/com/cyksj/model/views/RefundUpdradeOrderDonView.java

@@ -17,7 +17,9 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "refund_upgrade_order_don rd left join order_don o on o.id = rd.order_id")
+@SearchBean(tables = "refund_upgrade_order_don rd left join upgrade_order_don o on o.id = rd.order_id " +
+		"left join upgrade_package up on up.id = o.package_id left join goods_don g on g.id = up.goods_id " +
+		"left join goods_don_sku s on s.id = up.sku_id")
 public class RefundUpdradeOrderDonView {
 	@DbField("rd.id")
 	private Long id;
@@ -37,6 +39,12 @@ public class RefundUpdradeOrderDonView {
 	@DbField("rd.user_id")
 	private Long userId;
 
+	@DbField("g.title")
+	private String goodsName;
+
+	@DbField("s.spec_val")
+	private String specVal;
+
 	@DbIgnore
 	private String nickname;
 

netflix-service/src/main/java/com/cyksj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -123,12 +123,14 @@ public class MidjourneyServiceImpl implements MidjourneyService {
     /**
      * 恢复次数
      */
-    public void recoverUserLimit(Long id,Integer mode){
+    public void recoverUserLimit(Long id,Integer mode,Long num){
         if (mode == 1){
             redisService.incr(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + id, 1L);
         }
         if (mode == 2){
-            redisService.incr(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + id, 1L);
+            if (num != null) {
+                redisService.incr(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + id, 1L);
+            }
         }
     }
     @Override
@@ -167,7 +169,7 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         SubmitResult result = submit(user.getMode(),"action", param);
         if (flag.get()) {
             // 以上操作有弹窗确认，恢复次数
-            recoverUserLimit(user.getId(), user.getMode());
+            recoverUserLimit(user.getId(), user.getMode(),user.getMjRelaxNum());
         }
         return saveConversation(user.getId(), user.getMode(), Long.parseLong(result.getResult()),result.getProperties(),"ACTION", StringUtils.EMPTY);
     }
@@ -183,6 +185,9 @@ public class MidjourneyServiceImpl implements MidjourneyService {
         SubmitResult submitResult = Jsons.parseObject(body, SubmitResult.class);
         int code = submitResult.getCode();
         if (code != 1 && code != 21 && code != 22) {
+            if (code == 3) {
+                throw BusinessRuntimeException.getInstance("账号不存在");
+            }
             if (code == 24) {
                 throw BusinessRuntimeException.getInstance("prompt包含敏感词");
             }

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MidjourneyController.java

@@ -68,7 +68,7 @@ public class MidjourneyController {
             if (fastNum == null){
                 redisService.set(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + midjourneyUser.getId(), midjourneyUser.getMjFastNum(), RedisService.key.MIDJOURNEY_FAST_LIMIT.getTimeout());
             }else {
-                midjourneyUser.setMjFastNum(Integer.parseInt(fastNum.toString()));
+                midjourneyUser.setMjFastNum(Long.parseLong(fastNum.toString()));
             }
             Object relaxNum = redisService.get(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + midjourneyUser.getId());
             if (relaxNum == null){
@@ -76,7 +76,7 @@ public class MidjourneyController {
                     redisService.set(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + midjourneyUser.getId(), midjourneyUser.getMjRelaxNum(), RedisService.key.MIDJOURNEY_RELAX_LIMIT.getTimeout());
                 }
             }else {
-                midjourneyUser.setMjRelaxNum(Integer.parseInt(relaxNum.toString()));
+                midjourneyUser.setMjRelaxNum(Long.parseLong(relaxNum.toString()));
             }
         }
         return midjourneyUser;
@@ -115,12 +115,14 @@ public class MidjourneyController {
     /**
      * 恢复次数
      */
-    public void recoverUserLimit(Long id,Integer mode){
+    public void recoverUserLimit(Long id,Integer mode,Long num){
         if (mode == 1){
             redisService.incr(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + id, 1L);
         }
         if (mode == 2){
-            redisService.incr(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + id, 1L);
+            if (num != null){
+                redisService.incr(RedisService.key.MIDJOURNEY_RELAX_LIMIT.getName() + id, 1L);
+            }
         }
     }
 
@@ -169,7 +171,7 @@ public class MidjourneyController {
         try {
             conversation = midjourneyService.submitImagine(user, submitImagineDTO.getPrompt(), submitImagineDTO.getBase64Array());
         } catch (Exception e) {
-            recoverUserLimit(user.getId(), user.getMode());
+            recoverUserLimit(user.getId(), user.getMode(),num);
             throw BusinessRuntimeException.getInstance(e.getMessage());
         }
         syncUser(user.getId(), user.getMode(), num);
@@ -191,7 +193,7 @@ public class MidjourneyController {
         try {
             conversation = midjourneyService.submitDescribe(user, submitDescribeDTO.getBase64());
         } catch (Exception e) {
-            recoverUserLimit(user.getId(), user.getMode());
+            recoverUserLimit(user.getId(), user.getMode(),num);
             throw BusinessRuntimeException.getInstance(e.getMessage());
         }
         syncUser(user.getId(), user.getMode(), num);
@@ -213,7 +215,7 @@ public class MidjourneyController {
         try {
             conversation = midjourneyService.submitBlend(user, submitBlendDTO.getDimensions(), submitBlendDTO.getBase64Array());
         } catch (Exception e) {
-            recoverUserLimit(user.getId(), user.getMode());
+            recoverUserLimit(user.getId(), user.getMode(),num);
             throw BusinessRuntimeException.getInstance(e.getMessage());
         }
         syncUser(user.getId(), user.getMode(), num);
@@ -235,7 +237,7 @@ public class MidjourneyController {
         try {
             conversation = midjourneyService.submitModal(user, submitModalDTO.getTaskId(), submitModalDTO.getPrompt(), submitModalDTO.getMaskBase64());
         } catch (Exception e) {
-            recoverUserLimit(user.getId(), user.getMode());
+            recoverUserLimit(user.getId(), user.getMode(),num);
             throw BusinessRuntimeException.getInstance(e.getMessage());
         }
         syncUser(user.getId(), user.getMode(), num);
@@ -257,7 +259,7 @@ public class MidjourneyController {
         try {
             conversation = midjourneyService.submitShorten(user, submitShortenDTO.getPrompt());
         } catch (Exception e) {
-            recoverUserLimit(user.getId(), user.getMode());
+            recoverUserLimit(user.getId(), user.getMode(),num);
             throw BusinessRuntimeException.getInstance(e.getMessage());
         }
         syncUser(user.getId(), user.getMode(), num);
@@ -279,7 +281,7 @@ public class MidjourneyController {
         try {
             conversation = midjourneyService.submitAction(user, actionDTO.getTaskId(), actionDTO.getCustomId());
         } catch (Exception e) {
-            recoverUserLimit(user.getId(), user.getMode());
+            recoverUserLimit(user.getId(), user.getMode(),num);
             throw BusinessRuntimeException.getInstance(e.getMessage());
         }
         syncUser(user.getId(), user.getMode(), num);