yumeng hace 10 meses
padre
commit
d736769f13

+ 10 - 8
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemListController.java

@@ -302,7 +302,7 @@ public class KuaishouItemListController extends BaseController {
     @GetMapping("/checkItem")
     @ApiOperation(value = "检查此商品是否被绑定")
     @PostMapping
-    public JSONObject checkItem(Long itemId, String targetOwnershipId) {
+    public JSONObject checkItem(Long itemId, String targetOwnershipId, Integer mediaId) {
         JSONObject returnJson = new JSONObject();
         try {
             if (Check.isNull(itemId)) {
@@ -315,13 +315,15 @@ public class KuaishouItemListController extends BaseController {
                 returnJson.put("message", "此商品已被:" + itemInfo.getUserName() + "绑定!");
                 return returnJson;
             }
-            String ownership_id = kuaishouItemListService.getItemOwnership(itemId);
-            if (!Check.isNull(ownership_id)) {
-                String s = kuaishouItemListService.selectDataOwnershipNameById(ownership_id);
-                returnJson.put("code", 500);
-                returnJson.put("success", false);
-                returnJson.put("message", "此商品已在" + s + "团下绑定!");
-                return returnJson;
+            if (mediaId != 1) {
+                String ownership_id = kuaishouItemListService.getItemOwnership(itemId);
+                if (!Check.isNull(ownership_id)) {
+                    String s = kuaishouItemListService.selectDataOwnershipNameById(ownership_id);
+                    returnJson.put("code", 500);
+                    returnJson.put("success", false);
+                    returnJson.put("message", "此商品已在" + s + "团下绑定!");
+                    return returnJson;
+                }
             }
 
             if (!ownershipId.equals(targetOwnershipId)) {