Parcourir la source

Merge remote-tracking branch 'origin/master'

zhaoxian il y a 2 ans
Parent
commit
7d31c6c3ff
16 fichiers modifiés avec 290 ajouts et 20 suppressions
  1. 91 0
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java
  2. 58 0
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemListController.java
  3. 6 3
      ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java
  4. 2 0
      ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemCollectSamplesMapper.java
  5. 7 0
      ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemListMapper.java
  6. 4 0
      ruixuan-live/src/main/java/com/ruixuan/isc/mapper/SupplyChainMapper.java
  7. 4 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemCollectSamplesService.java
  8. 7 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemListService.java
  9. 2 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/ISupplyChainService.java
  10. 12 2
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java
  11. 15 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java
  12. 29 0
      ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/SupplyChainServiceImpl.java
  13. 1 14
      ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAgentAccountListServiceImpl.java
  14. 12 0
      ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml
  15. 23 0
      ruixuan-live/src/main/resources/mapper/isc/KuaishouItemListMapper.xml
  16. 17 1
      ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

+ 91 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -310,6 +310,46 @@ public class KuaishouItemCollectSamplesController extends BaseController {
     }
 
 
+    @PutMapping("/updateTask")
+    public JSONObject updateTask(@RequestBody KuaishouItemCollectSamples kuaishouItemCollectSamples) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            Long id = kuaishouItemCollectSamples.getId();
+            if (Check.isNull(id)) {
+                throw new Exception("id不能为空");
+            }
+
+            String collectSampleDesc = kuaishouItemCollectSamples.getCollectSampleDesc();
+            if (Check.isNull(collectSampleDesc)) {
+                kuaishouItemCollectSamples.setCollectSampleDesc("转审上传作业");
+            }
+            int i = kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
+            if (i > 0) {
+                List<Integer> statusList = new ArrayList<>();
+                statusList.add(4);
+                statusList.add(5);
+                for (int j = 0; j < statusList.size(); j++) {
+                    Integer status = statusList.get(j);
+                    KuaishouItemCollectSampleLog sampleLog = new KuaishouItemCollectSampleLog();
+                    sampleLog.setUserId(kuaishouItemCollectSamples.getUserId());
+                    sampleLog.setUserName(kuaishouItemCollectSamples.getUserName());
+                    sampleLog.setSampleId(id);
+                    sampleLog.setCollectSampleStatus(status);
+                    sampleLog.setCreateTime(new Date());
+                    sampleLog.setUpdateTime(new Date());
+                    kuaishouItemCollectSamplesService.insertLog(sampleLog);
+                }
+            }
+            returnJson.put("code", 0);
+            returnJson.put("message", "修改成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
     @GetMapping("/updateCourierNumber")
     public JSONObject updateCourierNumber(Long id, String courierNumber, String companyCode) {
         JSONObject returnJson = new JSONObject();
@@ -678,6 +718,57 @@ public class KuaishouItemCollectSamplesController extends BaseController {
         os.flush();
         os.close();
     }
+
+
+    @PostMapping("/batchProcess")
+    @ResponseBody
+    public JSONObject batchProcess(@RequestBody JSONObject requestJson) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            JSONArray ids = requestJson.getJSONArray("ids");
+            if (Check.isNull(ids)) {
+                throw new Exception("请传入需要审核的领样ID");
+            }
+            Integer status = requestJson.getInteger("status");
+            if (Check.isNull(status)) {
+                throw new Exception("请传入审核状态");
+            }
+            Long userId = requestJson.getLong("userId");
+            if (Check.isNull(userId)) {
+                throw new Exception("请传入审核人id");
+            }
+            String userName = requestJson.getString("userName");
+            if (Check.isNull(userName)) {
+                throw new Exception("请传入审核人姓名");
+            }
+            kuaishouItemCollectSamplesService.batchProcess(ids, status);
+            List<KuaishouItemCollectSampleLog> logs = new ArrayList<>();
+            for (int i = 0; i < ids.size(); i++) {
+                Long id = ids.getLong(i);
+                KuaishouItemCollectSampleLog sampleLog = new KuaishouItemCollectSampleLog();
+                sampleLog.setUserId(userId);
+                sampleLog.setUserName(userName);
+                sampleLog.setSampleId(id);
+                sampleLog.setCollectSampleStatus(status);
+                sampleLog.setCreateTime(new Date());
+                sampleLog.setUpdateTime(new Date());
+                logs.add(sampleLog);
+            }
+
+            if (!Check.isNull(logs)) {
+                kuaishouItemCollectSamplesService.batchAddLogs(logs);
+            }
+            returnJson.put("code", 0);
+            returnJson.put("message", "批量审核通过");
+        } catch (Exception e) {
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+
+    }
+
+
 }
 
 

+ 58 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemListController.java

@@ -195,6 +195,32 @@ public class KuaishouItemListController extends BaseController {
 
     }
 
+
+    @DeleteMapping("/unbindingItem")
+    public JSONObject unbindingItem(Long itemId) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            if (Check.isNull(itemId)) {
+                throw new Exception("商品ID不能为空");
+            }
+            Integer count = kuaishouItemListService.getSampleCount(itemId);
+            if (count > 0) {
+                returnJson.put("code", 500);
+                returnJson.put("message", "此商品有未完成的领样申请,暂时无法解绑");
+                return returnJson;
+            }
+            kuaishouItemListService.removeById(itemId);
+            returnJson.put("code", 0);
+            returnJson.put("message", "解绑成功");
+            return returnJson;
+        } catch (Exception e) {
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+            return returnJson;
+        }
+    }
+
+
     /**
      * 修改
      */
@@ -265,5 +291,37 @@ public class KuaishouItemListController extends BaseController {
         return returnJson;
     }
 
+
+    @PostMapping("/batchItemProcess")
+    @ResponseBody
+    public JSONObject batchItemProcess(@RequestBody JSONObject requestJson) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            JSONArray itemIds = requestJson.getJSONArray("itemIds");
+            if (Check.isNull(itemIds)) {
+                throw new Exception("请传入需要审核的商品ID");
+            }
+            Integer status = requestJson.getInteger("status");
+            if (Check.isNull(status)) {
+                throw new Exception("请传入审核状态");
+            }
+            Long examineId = requestJson.getLong("examineId");
+            if (Check.isNull(examineId)) {
+                throw new Exception("请传入审核人ID");
+            }
+            String examineName = requestJson.getString("examineName");
+            if (Check.isNull(examineName)) {
+                throw new Exception("请传入审核人名称");
+            }
+            kuaishouItemListService.batchItemProcess(itemIds, status,examineId,examineName);
+            returnJson.put("code", 0);
+            returnJson.put("message", "批量审核通过");
+        } catch (Exception e) {
+            returnJson.put("code", 500);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
 }
 

+ 6 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -664,11 +664,15 @@ public class SupplyChainController extends BaseController {
                 export.add(date.getString("deliveryNum"));
                 export.add(date.getString("deliveryRadio"));
                 export.add(date.getString("notDeliveryNum"));
+                String userName = supplyChainService.getUserName(date.getLong("promoterId"));
+                if (!Check.isNull(userName)) {
+                    export.add(userName);
+                }
                 exportList.add(export);
             }
         }
 
-        String[] headers = {"达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数"};
+        String[] headers = {"达人ID", "达人名称", "订单数", "有效订单数", "有效订单率", "发货数", "发货率", "未发货数", "绑定人"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();
@@ -1299,7 +1303,7 @@ public class SupplyChainController extends BaseController {
     public TableDataInfo bdTotal(
             @ApiParam("开始时间") @RequestParam(value = "orderStartDate", required = false) String orderStartDate,
             @ApiParam("结束时间") @RequestParam(value = "orderEndDate", required = false) String orderEndDate,
-            @ApiParam("用户ID") @RequestParam(value = "collectSampleId", required = false) Long collectSampleId){
+            @ApiParam("用户ID") @RequestParam(value = "collectSampleId", required = false) Long collectSampleId) {
         Map<String, Object> requestMap = new HashMap<>();
         if (!Check.isNull(orderStartDate)) {
             Integer start = DateUtils.getIntegerTime(orderStartDate);
@@ -1371,5 +1375,4 @@ public class SupplyChainController extends BaseController {
     }
 
 
-
 }

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemCollectSamplesMapper.java

@@ -110,5 +110,7 @@ public interface KuaishouItemCollectSamplesMapper {
     List<Long> getItemIdsByCreateId(@Param("userList") List<Long> userList);
 
     List<JSONObject> queryProductList(Map<String, Object> map);
+
+    void batchProcess(@Param("ids") JSONArray ids,@Param("status") Integer status);
 }
 

+ 7 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemListMapper.java

@@ -1,6 +1,7 @@
 package com.ruixuan.isc.mapper;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.isc.entity.KuaishouItemCategory;
 import com.ruixuan.isc.entity.KuaishouItemList;
@@ -42,5 +43,11 @@ public interface KuaishouItemListMapper {
     List<Long> getActivityIds(@Param("userId") Long userId);
 
     List<JSONObject> selectItemInfo(@Param("map") Map<Long, Long> map);
+
+    Integer getSampleCount(@Param("itemId") Long itemId);
+
+    void removeById(@Param("itemId") Long itemId);
+
+    void batchItemProcess(@Param("itemIds") JSONArray itemIds,@Param("status") Integer status,@Param("examineId") Long examineId,@Param("examineName") String examineName);
 }
 

+ 4 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/SupplyChainMapper.java

@@ -94,4 +94,8 @@ public interface SupplyChainMapper {
     List<JSONObject> bdTotal(Map<String, Object> requestMap);
 
     List<JSONObject> exportBdDetail(Map<String, Object> requestMap);
+
+    List<JSONObject> getUserList(@Param("map") Map<Long, Long> map);
+
+    String getUserName(@Param("promoterId") Long promoterId);
 }

+ 4 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemCollectSamplesService.java

@@ -103,5 +103,9 @@ public interface IKuaishouItemCollectSamplesService {
     List<JSONObject> queryProductList(Map<String, Object> map);
 
     List<JSONObject> exportProductList(Map<String, Object> map);
+
+    void batchProcess(JSONArray ids,Integer status);
+
+    void batchAddLogs(List<KuaishouItemCollectSampleLog> logs);
 }
 

+ 7 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemListService.java

@@ -1,5 +1,6 @@
 package com.ruixuan.isc.service;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kuaishou.merchant.open.api.KsMerchantApiException;
 import com.ruixuan.isc.entity.KuaishouItemList;
@@ -37,5 +38,11 @@ public interface IKuaishouItemListService {
     void updateCount(Long itemId, Integer sampleCount, Integer userCount);
 
     List<Long> getActivityIds(Long userId);
+
+    Integer getSampleCount(Long itemId);
+
+    void removeById(Long itemId);
+
+    void batchItemProcess(JSONArray itemIds, Integer status,Long examineId,String examineName);
 }
 

+ 2 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/ISupplyChainService.java

@@ -117,4 +117,6 @@ public interface ISupplyChainService {
     List<JSONObject> bdTotal(Map<String, Object> requestMap);
 
     List<JSONObject> exportBdDetail(Map<String, Object> requestMap);
+
+    String getUserName(Long promoterId);
 }

+ 12 - 2
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java

@@ -176,7 +176,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
             for (int j = 0; j < ids.size(); j++) {
                 Long id = ids.getLong(j);
                 JSONObject promoterJson = promoterMap.get(id);
-                if(Check.isNull(promoterJson)){
+                if (Check.isNull(promoterJson)) {
                     continue;
                 }
                 Long promoterId = promoterJson.getLong("promoterId");
@@ -196,7 +196,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                 sampleJson.put("itemCreateName", itemJson.getString("userName"));
                 sampleJson.put("collectSampleId", userId);
                 sampleJson.put("collectSampleName", nickName);
-              
+
                 sampleJson.put("promoterId", promoterId);
                 sampleJson.put("promoterNickName", promoterJson.getString("promoterNickName"));
                 sampleJson.put("promoterPhone", promoterJson.getString("promoterPhone"));
@@ -645,6 +645,16 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         return kuaishouItemCollectSamplesMapper.queryProductList(map);
     }
 
+    @Override
+    public void batchProcess(JSONArray ids, Integer status) {
+        kuaishouItemCollectSamplesMapper.batchProcess(ids, status);
+    }
+
+    @Override
+    public void batchAddLogs(List<KuaishouItemCollectSampleLog> logs) {
+        kuaishouItemCollectSamplesMapper.batchAddLogs(logs);
+    }
+
     // 渠道—数据分析
     private JSONObject getDataAnalysisByChannel(List<Long> userList, String startDate, String endDate) {
         JSONObject data = new JSONObject();

+ 15 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemListServiceImpl.java

@@ -386,6 +386,21 @@ public class KuaishouItemListServiceImpl implements IKuaishouItemListService {
         return kuaishouItemListMapper.getActivityIds(userId);
     }
 
+    @Override
+    public Integer getSampleCount(Long itemId) {
+        return kuaishouItemListMapper.getSampleCount(itemId);
+    }
+
+    @Override
+    public void removeById(Long itemId) {
+        kuaishouItemListMapper.removeById(itemId);
+    }
+
+    @Override
+    public void batchItemProcess(JSONArray itemIds, Integer status,Long examineId,String examineName) {
+        kuaishouItemListMapper.batchItemProcess(itemIds,status,examineId,examineName);
+    }
+
 
 }
 

+ 29 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/SupplyChainServiceImpl.java

@@ -7,6 +7,7 @@ import com.ruixuan.isc.service.ISupplyChainService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -20,14 +21,37 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
     public List<JSONObject> getOrderList(Map<String, Object> requestMap) {
         List<JSONObject> list = supplyChainMapper.getOrderList(requestMap);
         if (!Check.isNull(list)) {
+            Map<Long, Long> map = new HashMap<>();
             for (int i = 0; i < list.size(); i++) {
                 JSONObject jsonObject = list.get(i);
                 Long promoterId = jsonObject.getLong("promoterId");
                 requestMap.put("promoterId", promoterId);
                 List<JSONObject> topOrders = supplyChainMapper.getTopOrders(requestMap);
                 jsonObject.put("topOrders", topOrders);
+                map.put(promoterId, promoterId);
+            }
+            Map<Long, String> userMap = new HashMap<>();
+            if (!Check.isNullMap(map)) {
+                List<JSONObject> userList = supplyChainMapper.getUserList(map);
+                for (int i = 0; i < userList.size(); i++) {
+                    JSONObject jsonObject = userList.get(i);
+                    userMap.put(jsonObject.getLong("promoterId"), jsonObject.getString("userName"));
+                }
+            }
+
+            if (!Check.isNullMap(userMap)) {
+                for (int i = 0; i < list.size(); i++) {
+                    JSONObject jsonObject = list.get(i);
+                    Long promoterId = jsonObject.getLong("promoterId");
+                    String userName = userMap.get(promoterId);
+                    if (!Check.isNull(userName)) {
+                        jsonObject.put("userName", userName);
+                    }
+                }
             }
         }
+
+
         return list;
     }
 
@@ -235,4 +259,9 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
     public List<JSONObject> exportBdDetail(Map<String, Object> requestMap) {
         return supplyChainMapper.exportBdDetail(requestMap);
     }
+
+    @Override
+    public String getUserName(Long promoterId) {
+        return supplyChainMapper.getUserName(promoterId);
+    }
 }

+ 1 - 14
ruixuan-live/src/main/java/com/ruixuan/jinniu/service/impl/KuaishouAgentAccountListServiceImpl.java

@@ -1,8 +1,5 @@
 package com.ruixuan.jinniu.service.impl;
-
-
 import java.util.*;
-
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.common.utils.Check;
@@ -160,18 +157,8 @@ public class KuaishouAgentAccountListServiceImpl implements IKuaishouAgentAccoun
                 kuaishouAgentAccountListMapper.addBatch(addList);
                 if (adDspAccountList.size() >= pageSize) {
                     kuaishouAgentAccountListService(cookie, currentPage + 1, pageSize, createBeginTime, createEndTime);
-
                 }
-
             }
-
-
         }
-
-
-        //
-
-
     }
-}
-
+}

+ 12 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml

@@ -494,6 +494,18 @@
         where courier_number = #{courierNumber}
 
     </update>
+    <update id="batchProcess">
+        update kuaishou_item_collect_samples set collect_sample_status = #{status}
+        where 1 = 1
+        <if test='ids != null and ids.size() > 0'>
+            AND id in
+            <foreach collection="ids" item="id" separator=","
+                     open="(" close=")">
+                #{id}
+            </foreach>
+        </if>
+
+    </update>
 
     <delete id="deleteKuaishouItemCollectSamplesById" parameterType="java.lang.Long">
         delete

+ 23 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemListMapper.xml

@@ -108,6 +108,14 @@
             ${v}
         </foreach>
     </select>
+    <select id="getSampleCount" resultType="java.lang.Integer" parameterType="java.lang.Long">
+        select  count(1)  from kuaishou_item_collect_samples
+        where
+        item_id = #{itemId}
+        and collect_sample_status  in(
+        1,3,4,5,6
+        )
+    </select>
 
 
     <insert id="insertItem" parameterType="com.ruixuan.isc.entity.KuaishouItemList">
@@ -284,10 +292,25 @@
         samples_peoples = #{userCount}
         where item_id = #{itemId}
     </update>
+    <update id="batchItemProcess">
+        update kuaishou_item_list set examine_id = #{examineId},examine_name = #{examineName},examine_status = #{status}
+        where 1 = 1
+        <if test='itemIds != null and itemIds.size() > 0'>
+            AND item_id in
+            <foreach collection="itemIds" item="itemId" separator=","
+                     open="(" close=")">
+                #{itemId}
+            </foreach>
+        </if>
+
+    </update>
 
     <delete id="deleteKuaishouItemListByItemIds" parameterType="java.lang.Long">
         delete from kuaishou_item_list where item_id = #{itemId}
     </delete>
+    <delete id="removeById" parameterType="java.lang.Long">
+         delete from kuaishou_item_list where item_id = #{itemId}
+    </delete>
 
 
 </mapper>

+ 17 - 1
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -1319,7 +1319,8 @@
             and collect_sample_id = #{collectSampleId}
         </if>
         <if test="start != null and start != ''">
-            and create_time &gt;= str_to_date(concat(date_format(#{start}, '%Y-%m-%d'), '00:00:01'), '%Y-%m-%d %H:%i:%s')
+            and create_time &gt;= str_to_date(concat(date_format(#{start}, '%Y-%m-%d'), '00:00:01'), '%Y-%m-%d
+            %H:%i:%s')
         </if>
         <if test="end != null and end != ''">
             and create_time &lt;= str_to_date(concat(date_format(#{end}, '%Y-%m-%d'), '23:59:59'), '%Y-%m-%d %H:%i:%s')
@@ -1461,4 +1462,19 @@
         on t1.promoterId = t2.promoterId
         order by t1.orderNum desc
     </select>
+    <select id="getUserList" resultType="com.alibaba.fastjson.JSONObject">
+        select promoter_id as 'promoterId', group_concat(user_name) as 'userName'
+        from kuaishou_promoter where promoter_id in
+        <foreach collection="map.values" item="v" separator="," open="(" close=")">
+            ${v}
+        </foreach>
+        GROUP BY promoter_id
+    </select>
+    <select id="getUserName" resultType="java.lang.String" parameterType="java.lang.Long">
+        select
+        group_concat(user_name)  as 'userName'
+        from kuaishou_promoter
+        where   promoter_id  = #{promoterId}
+
+    </select>
 </mapper>