yumeng 2 年之前
父節點
當前提交
24b539a023

+ 37 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -16,12 +16,11 @@ import com.ruixuan.common.core.domain.entity.SysUser;
 import com.ruixuan.common.core.page.TableDataInfo;
 import com.ruixuan.common.utils.Check;
 import com.ruixuan.data.utils.ExportExcelUtils;
-import com.ruixuan.isc.entity.KuaishouItemCollectSampleExpress;
-import com.ruixuan.isc.entity.KuaishouItemCollectSampleLog;
-import com.ruixuan.isc.entity.KuaishouItemCollectSamples;
+import com.ruixuan.isc.entity.*;
 import com.ruixuan.isc.enums.CompanyEnum;
 import com.ruixuan.isc.service.IKuaishouItemCollectSamplesService;
 import com.ruixuan.isc.service.IKuaishouItemListService;
+import com.ruixuan.isc.service.IKuaishouPromoterService;
 import com.ruixuan.system.service.ISysDeptService;
 import com.ruixuan.system.service.ISysRoleService;
 import com.ruixuan.system.service.ISysUserService;
@@ -75,6 +74,8 @@ public class KuaishouItemCollectSamplesController extends BaseController {
     private ISysUserService sysUserService;
     @Autowired
     private IKuaishouItemListService itemListService;
+    @Autowired
+    private IKuaishouPromoterService promoterService;
 
     /**
      * 查询【请填写功能名称】列表
@@ -769,6 +770,39 @@ public class KuaishouItemCollectSamplesController extends BaseController {
     }
 
 
+    @GetMapping("/samplesCheck")
+    @ResponseBody
+    public JSONObject samplesCheck(Long itemId, Long promoterId,Long userId) {
+        JSONObject returnJson = new JSONObject();
+        try {
+
+            KuaishouItemList itemInfoByItemId = itemListService.getItemInfoByItemId(itemId);
+            if (Check.isNull(itemInfoByItemId)) {
+                throw new Exception("该商品未录入");
+            }
+
+            Integer activityItemStatus = itemInfoByItemId.getActivityItemStatus();
+            if (activityItemStatus == 3 || activityItemStatus == 4 || activityItemStatus == 5) {
+                throw new Exception("该商品已下架或失效");
+            }
+
+            KuaishouPromoter onlyPromoterInfo = promoterService.getOnlyPromoterInfo(promoterId);
+            if (Check.isNull(onlyPromoterInfo)) {
+                throw new Exception("该达人未录入");
+            }
+
+            returnJson.put("code", 0);
+            returnJson.put("message", "校验通过");
+            returnJson.put("id", onlyPromoterInfo.getId());
+        } catch (Exception e) {
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+
+    }
+
+
 }
 
 

+ 5 - 3
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -63,7 +63,8 @@
         order by t.orderNum desc limit 3
     </select>
     <select id="anchorOrderDetail" resultType="com.alibaba.fastjson.JSONObject">
-        select *
+        select t.*,
+        t2.status
         from (select
         item_title as 'itemTitle',
         item_id as 'itemId',
@@ -78,7 +79,6 @@
         sum(case when send_status = 0 and order_status != 80 then 1 else 0 end) as 'notDeliveryNum',
         round(sum(case when send_status = 1 and order_status != 80 then 1 else 0 end) / sum(case when order_status != 80
         then 1 else 0 end),4) as 'deliveryRadio'
-
         from kuaishou_supply_chain
         where 1= 1
         <if test="promoterId != null and promoterId != ''">
@@ -97,7 +97,9 @@
         <if test="itemTitle != null and itemTitle != ''">
             and item_title like concat(concat('%',#{itemTitle}),'%')
         </if>
-        group by item_id) t
+        group by item_id) t left join ( select item_id as 'itemId', collect_sample_status as 'status' from
+        kuaishou_item_collect_samples where promoter_id = #{promoterId}) t2
+        on t.itemId = t2.itemId
         order by t.orderNum desc
     </select>
     <select id="orderStatistics" resultType="com.alibaba.fastjson.JSONObject">