yumeng 2 years ago
parent
commit
13ab327b00

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

@@ -392,18 +392,20 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             for (int i = 0; i < list.size(); i++) {
                 JSONObject date = list.get(i);
                 List<Object> export = new ArrayList();
+                export.add(date.getString("id"));
                 export.add(date.getString("itemId"));
                 export.add(date.getString("itemTitle"));
                 export.add(date.getString("promoterId"));
                 export.add(date.getString("promoterNickName"));
                 export.add(date.getString("sampleCount"));
                 export.add(date.getString("sampleRequirement"));
+                export.add(date.getString("consignee"));
                 export.add(date.getString("promoterPhone"));
                 export.add(date.getString("promoterAddress"));
                 exportList.add(export);
             }
         }
-        String[] headers = {"商品ID", "商品名称", "达人ID", "达人昵称", "领样数量", "领样规则", "收件人手机号码", "收件人地址"};
+        String[] headers = {"id","商品ID", "商品名称", "达人ID", "达人昵称", "领样数量", "领样规则", "收件人", "收件人手机号码", "收件人地址"};
         OutputStream os = response.getOutputStream();
         ExportExcelUtils eeu = new ExportExcelUtils();
         XSSFWorkbook workbook = new XSSFWorkbook();

+ 80 - 25
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemCollectSamples.java

@@ -13,99 +13,145 @@ import org.springframework.data.annotation.Transient;
  * @author ruoyi
  * @date 2023-02-08
  */
-public class KuaishouItemCollectSamples extends BaseEntity
-{
+public class KuaishouItemCollectSamples extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
     private Long id;
 
-    /** 商品ID */
+    /**
+     * 商品ID
+     */
     @Excel(name = "商品ID")
     private Long itemId;
 
-    /** 商品标题 */
+    /**
+     * 商品标题
+     */
     @Excel(name = "商品标题")
     private String itemTitle;
 
-    /** 商品单价-分 */
+    /**
+     * 商品单价-分
+     */
     @Excel(name = "商品单价-分")
     private Long itemPrice;
 
-    /** 商品图片链接 */
+    /**
+     * 商品图片链接
+     */
     @Excel(name = "商品图片链接")
     private String itemImgUrl;
 
-    /** 商品备注 */
+    /**
+     * 商品备注
+     */
     @Excel(name = "商品备注")
     private String itemDesc;
 
-    /** 佣金比例 */
+    /**
+     * 佣金比例
+     */
     @Excel(name = "佣金比例")
     private Long commissionRate;
 
-    /** 服务费 */
+    /**
+     * 服务费
+     */
     @Excel(name = "服务费")
     private Long regimentalPromotion;
 
-    /** 领样数量 */
+    /**
+     * 领样数量
+     */
     @Excel(name = "领样数量")
     private Integer sampleCount;
 
-    /** 领样规则 */
+    /**
+     * 领样规则
+     */
     @Excel(name = "领样规则")
     private String sampleRequirement;
 
-    /** 商品创建人ID */
+    /**
+     * 商品创建人ID
+     */
     @Excel(name = "商品创建人ID")
     private Long itemCreateId;
 
-    /** 商品创建人姓名 */
+    /**
+     * 商品创建人姓名
+     */
     @Excel(name = "商品创建人姓名")
     private String itemCreateName;
 
-    /** 领样人ID */
+    /**
+     * 领样人ID
+     */
     @Excel(name = "领样人ID")
     private Long collectSampleId;
 
-    /** 领样人姓名 */
+    /**
+     * 领样人姓名
+     */
     @Excel(name = "领样人姓名")
     private String collectSampleName;
 
-    /** 手卡信息 */
+    /**
+     * 手卡信息
+     */
     @Excel(name = "手卡信息")
     private String partnerRecommendText;
 
-    /** 达人id */
+    /**
+     * 达人id
+     */
     @Excel(name = "达人id")
     private Long promoterId;
 
-    /** 达人昵称 */
+    /**
+     * 达人昵称
+     */
     @Excel(name = "达人昵称")
     private String promoterNickName;
 
-    /** 达人手机号 */
+    /**
+     * 达人手机号
+     */
     @Excel(name = "达人手机号")
     private String promoterPhone;
 
-    /** 达人收获地址 */
+    /**
+     * 达人收获地址
+     */
     @Excel(name = "达人收获地址")
     private String promoterAddress;
     private String promoterUrl;
+    private String consignee;
 
-    /** 快递单号 */
+    /**
+     * 快递单号
+     */
     @Excel(name = "快递单号")
     private String courierNumber;
 
-    /** 作业地址 */
+    /**
+     * 作业地址
+     */
     @Excel(name = "作业地址")
     private String taskFileUrl;
 
-    /** 1-待审核 2-领样申请审核拒绝 3-领样审核通过-待录入订单号 4-已发货 5-已签收待上传作业 6-作业上传成功待招商审核 7-审核通过 */
+    /**
+     * 1-待审核 2-领样申请审核拒绝 3-领样审核通过-待录入订单号 4-已发货 5-已签收待上传作业 6-作业上传成功待招商审核 7-审核通过
+     */
     @Excel(name = "1-待审核 2-领样申请审核拒绝 3-领样审核通过-待录入订单号 4-已发货 5-已签收待上传作业 6-作业上传成功待招商审核 7-审核通过")
     private Integer collectSampleStatus;
 
-    /** 状态备注 */
+    /**
+     * 状态备注
+     */
     @Excel(name = "状态备注")
     private String collectSampleDesc;
 
@@ -282,6 +328,14 @@ public class KuaishouItemCollectSamples extends BaseEntity
         this.promoterUrl = promoterUrl;
     }
 
+    public String getConsignee() {
+        return consignee;
+    }
+
+    public void setConsignee(String consignee) {
+        this.consignee = consignee;
+    }
+
     public String getCourierNumber() {
         return courierNumber;
     }
@@ -361,6 +415,7 @@ public class KuaishouItemCollectSamples extends BaseEntity
                 ", promoterPhone='" + promoterPhone + '\'' +
                 ", promoterAddress='" + promoterAddress + '\'' +
                 ", promoterUrl='" + promoterUrl + '\'' +
+                ", consignee='" + consignee + '\'' +
                 ", courierNumber='" + courierNumber + '\'' +
                 ", taskFileUrl='" + taskFileUrl + '\'' +
                 ", collectSampleStatus=" + collectSampleStatus +

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

@@ -151,6 +151,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                 sampleJson.put("promoterNickName", promoterJson.getString("promoterNickName"));
                 sampleJson.put("promoterPhone", promoterJson.getString("promoterPhone"));
                 sampleJson.put("promoterAddress", promoterJson.getString("promoterAddress"));
+                sampleJson.put("consignee", promoterJson.getString("consignee"));
                 sampleJson.put("promoterUrl", promoterJson.getString("promoterUrl"));
                 sampleJson.put("collectSampleStatus", 1);
                 sampleJson.put("collectSampleDesc", "待招商审核");
@@ -188,6 +189,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
             sample.setPromoterId(sampleJson.getLong("promoterId"));
             sample.setPromoterPhone(sampleJson.getString("promoterPhone"));
             sample.setPromoterAddress(sampleJson.getString("promoterAddress"));
+            sample.setConsignee(sampleJson.getString("consignee"));
             sample.setCollectSampleStatus(sampleJson.getInteger("collectSampleStatus"));
             sample.setCollectSampleDesc(sampleJson.getString("collectSampleDesc"));
             sample.setPromoterNickName(sampleJson.getString("promoterNickName"));

+ 10 - 2
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml

@@ -25,6 +25,7 @@
         <result property="promoterUrl" column="promoter_url"/>
         <result property="promoterPhone" column="promoter_phone"/>
         <result property="promoterAddress" column="promoter_address"/>
+        <result property="consignee" column="consignee"/>
         <result property="courierNumber" column="courier_number"/>
         <result property="taskFileUrl" column="task_file_url"/>
         <result property="collectSampleStatus" column="collect_sample_status"/>
@@ -34,7 +35,7 @@
     </resultMap>
 
     <sql id="selectKuaishouItemCollectSamplesVo">
-        select id, item_id, item_title, item_price, item_img_url, item_desc, commission_rate, regimental_promotion, sample_count, sample_requirement, item_create_id, item_create_name, collect_sample_id, collect_sample_name, partner_recommend_text, promoter_id, promoter_nick_name,promoter_url, promoter_phone, promoter_address, courier_number, task_file_url, collect_sample_status, collect_sample_desc, create_time, update_time from kuaishou_item_collect_samples
+        select id, item_id, item_title, item_price, item_img_url, item_desc, commission_rate, regimental_promotion, sample_count, sample_requirement, item_create_id, item_create_name, collect_sample_id, collect_sample_name, partner_recommend_text, promoter_id, promoter_nick_name,promoter_url, promoter_phone, promoter_address, consignee,courier_number, task_file_url, collect_sample_status, collect_sample_desc, create_time, update_time from kuaishou_item_collect_samples
     </sql>
 
     <select id="selectKuaishouItemCollectSamplesList" parameterType="com.ruixuan.isc.entity.KuaishouItemCollectSamples"
@@ -101,6 +102,7 @@
         promoter_id as 'promoterId',
         promoter_nick_name as 'promoterNickName',
         promoter_url as 'promoterUrl',
+        consignee,
         concat(province,'-',promoter_address) as 'promoterAddress',
         phone as 'promoterPhone'
         from kuaishou_promoter
@@ -144,15 +146,16 @@
     </select>
     <select id="exportCollectSamples" resultType="com.alibaba.fastjson.JSONObject">
         select
+        id as 'id',
         item_id as 'itemId',
         item_title as 'itemTitle',
         promoter_id as 'promoterId',
         promoter_nick_name as 'promoterNickName',
         sample_count as 'sampleCount',
         sample_requirement as 'sampleRequirement',
+        consignee as 'consignee',
         promoter_phone as 'promoterPhone',
         promoter_address as 'promoterAddress'
-
         from kuaishou_item_collect_samples
         where 1= 1
         <if test='ids != null and ids.size() > 0'>
@@ -189,6 +192,7 @@
             <if test="promoterUrl != null">promoter_url,</if>
             <if test="promoterPhone != null">promoter_phone,</if>
             <if test="promoterAddress != null">promoter_address,</if>
+            <if test="consignee != null">consignee,</if>
             <if test="courierNumber != null">courier_number,</if>
             <if test="taskFileUrl != null">task_file_url,</if>
             <if test="collectSampleStatus != null">collect_sample_status,</if>
@@ -217,6 +221,7 @@
             <if test="promoterUrl != null">#{promoterUrl},</if>
             <if test="promoterPhone != null">#{promoterPhone},</if>
             <if test="promoterAddress != null">#{promoterAddress},</if>
+            <if test="consignee != null">#{consignee},</if>
             <if test="courierNumber != null">#{courierNumber},</if>
             <if test="taskFileUrl != null">#{taskFileUrl},</if>
             <if test="collectSampleStatus != null">#{collectSampleStatus},</if>
@@ -245,6 +250,7 @@
         promoter_nick_name,
         promoter_phone,
         promoter_address,
+        consignee,
         courier_number,
         task_file_url,
         promoter_url,
@@ -272,6 +278,7 @@
             #{add.promoterNickName},
             #{add.promoterPhone},
             #{add.promoterAddress},
+            #{add.consignee},
             #{add.courierNumber},
             #{add.taskFileUrl},
             #{add.promoterUrl},
@@ -357,6 +364,7 @@
             <if test="promoterUrl != null">promoter_url = #{promoterUrl},</if>
             <if test="promoterPhone != null">promoter_phone = #{promoterPhone},</if>
             <if test="promoterAddress != null">promoter_address = #{promoterAddress},</if>
+            <if test="consignee != null">consignee = #{consignee},</if>
             <if test="courierNumber != null">courier_number = #{courierNumber},</if>
             <if test="taskFileUrl != null">task_file_url = #{taskFileUrl},</if>
             <if test="collectSampleStatus != null">collect_sample_status = #{collectSampleStatus},</if>