fix 套餐退款

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

@@ -396,7 +396,16 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         if (upgradePackage.getGoodsId() == 26) {
             MidjourneyUser midjourneyUser = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class).eq(MidjourneyUser::getRelationId, orderDon.getRelationId()));
             if (midjourneyUser != null) {
-                midjourneyUserMapper.update(null, Wrappers.lambdaUpdate(MidjourneyUser.class).set(MidjourneyUser::getMjFastNum, midjourneyUser.getMjFastNum() > orderDon.getNum() ? midjourneyUser.getMjFastNum() - orderDon.getNum() : 0).eq(MidjourneyUser::getId, midjourneyUser.getId()));
+                int update = midjourneyUserMapper.update(null, Wrappers.lambdaUpdate(MidjourneyUser.class)
+                        .set(MidjourneyUser::getMjFastNum, midjourneyUser.getMjFastNum() < upgradePackage.getNum() ? 0 : midjourneyUser.getMjFastNum() - upgradePackage.getNum())
+                        .eq(MidjourneyUser::getId, midjourneyUser.getId()));
+                if (update == 0) {
+                    log.info("midjourneyUser 套餐包增值失败 id:{},orderId:{}", midjourneyUser.getId(), orderDon.getId());
+                }
+                Long decr = redisService.decr(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + midjourneyUser.getId(), upgradePackage.getNum().longValue());
+                if (decr < 0) {
+                    redisService.set(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + midjourneyUser.getId(), 0L);
+                }
             }
         }
     }
@@ -424,21 +433,6 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                     userBenefitsService.addUserBalance(orderDon.getUserId(), orderDon.getRefundBalance(), UserBalanceSourceRecord.Source.refund, 0L, orderDon.getId(), upgradePackage.getName() + UserBalanceSourceRecord.Source.refund.getDesc(), true);
                 }
             }
-            if (upgradePackage.getGoodsId() == 26) {
-                MidjourneyUser midjourneyUser = midjourneyUserMapper.selectOne(Wrappers.lambdaQuery(MidjourneyUser.class).eq(MidjourneyUser::getRelationId, orderDon.getRelationId()));
-                if (midjourneyUser != null) {
-                    int update = midjourneyUserMapper.update(null, Wrappers.lambdaUpdate(MidjourneyUser.class)
-                            .set(MidjourneyUser::getMjFastNum, midjourneyUser.getMjFastNum() < upgradePackage.getNum() ? 0 : midjourneyUser.getMjFastNum() - upgradePackage.getNum())
-                            .eq(MidjourneyUser::getId, midjourneyUser.getId()));
-                    if (update == 0) {
-                        log.info("midjourneyUser 套餐包增值失败 id:{},orderId:{}", midjourneyUser.getId(), orderDon.getId());
-                    }
-                    Long decr = redisService.decr(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + midjourneyUser.getId(), upgradePackage.getNum().longValue());
-                    if (decr < 0) {
-                        redisService.set(RedisService.key.MIDJOURNEY_FAST_LIMIT.getName() + midjourneyUser.getId(), 0L);
-                    }
-                }
-            }
         });
     }
     /**

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

@@ -65,6 +65,9 @@ public class MirrorController {
     @Value("${midjourney.url}")
     private String midjourneyHost;
 
+    @Value("${midjourney.drawUrl}")
+    private String midjourneyDrawUrl;
+
 
     /**
      * GPT车票跳转登录
@@ -312,7 +315,7 @@ public class MirrorController {
     public void midjourneyMirror(@PathVariable Long relationId,HttpServletResponse response) throws IOException {
         Long userId = StpUserUtil.getLoginIdAsLong();
         MidjourneyUser midjourneyUser = midjourneyAccountService.getMidjourneyUserToken(userId, relationId);
-        response.sendRedirect( midjourneyHost + (envCommonService.isPreEnv() ? "8082":"8081") +"/api/applets/mirror/midjourneyMirrorWithToken/" + midjourneyUser.getUserToken());
+        response.sendRedirect( midjourneyHost + (envCommonService.isPreEnv() ? "/8082":"/8081") +"/api/applets/mirror/midjourneyMirrorWithToken/" + midjourneyUser.getUserToken());
     }
 
     @GetMapping("/midjourneyMirrorWithToken/{userToken}")
@@ -321,6 +324,6 @@ public class MirrorController {
         cookie.setMaxAge(31536000);
         cookie.setPath("/");
         response.addCookie(cookie);
-        response.sendRedirect(midjourneyHost + "/draw/web/");
+        response.sendRedirect(midjourneyDrawUrl);
     }
 }

netflix-web/src/main/resources/application-pre.yml

@@ -191,4 +191,5 @@ smsVerify:
   shoppingApikey: 72d4ff765b6c962f35c9a4125100680d
 
 midjourney:
-  url: https://nf.video
+  url: https://nf.video
+  drawUrl: https://nf.video/drawTest/web/