yumeng 2 years ago
parent
commit
13ae23e215

+ 22 - 10
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -125,7 +125,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             if (Check.isNull(sysUser)) {
             if (Check.isNull(sysUser)) {
                 throw new Exception("未获取到登录人信息");
                 throw new Exception("未获取到登录人信息");
             }
             }
-
             JSONArray itemIds = requestJson.getJSONArray("itemIds");
             JSONArray itemIds = requestJson.getJSONArray("itemIds");
             if (Check.isNull(itemIds)) {
             if (Check.isNull(itemIds)) {
                 throw new Exception("请传入需要申请的商品列表");
                 throw new Exception("请传入需要申请的商品列表");
@@ -170,7 +169,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             returnJson.put("code", -1);
             returnJson.put("code", -1);
             returnJson.put("message", e.getMessage());
             returnJson.put("message", e.getMessage());
         }
         }
-
         return returnJson;
         return returnJson;
     }
     }
 
 
@@ -214,7 +212,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                     kuaishouItemCollectSamples.setCollectSampleDesc("作业已完成");
                     kuaishouItemCollectSamples.setCollectSampleDesc("作业已完成");
                 }
                 }
             }
             }
-
             String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
             String courierNumber = kuaishouItemCollectSamples.getCourierNumber();
             if (!Check.isNull(courierNumber)) {
             if (!Check.isNull(courierNumber)) {
                 kuaishouItemCollectSamples.setCollectSampleStatus(4);
                 kuaishouItemCollectSamples.setCollectSampleStatus(4);
@@ -227,7 +224,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                 kuaishouItemCollectSamples.setCollectSampleStatus(6);
                 kuaishouItemCollectSamples.setCollectSampleStatus(6);
                 kuaishouItemCollectSamples.setCollectSampleDesc("作业上传成功,待招商审核");
                 kuaishouItemCollectSamples.setCollectSampleDesc("作业上传成功,待招商审核");
             }
             }
-
             kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
             kuaishouItemCollectSamplesService.updateKuaishouItemCollectSamples(kuaishouItemCollectSamples);
             returnJson.put("code", 0);
             returnJson.put("code", 0);
             returnJson.put("message", "修改成功");
             returnJson.put("message", "修改成功");
@@ -240,8 +236,27 @@ public class KuaishouItemCollectSamplesController extends BaseController {
     }
     }
 
 
 
 
+    @GetMapping("/detail")
+    public JSONObject detail(Long id) {
+        JSONObject returnJson = new JSONObject();
+        try {
+            if (Check.isNull(id)) {
+                throw new Exception("id不能为空");
+            }
+            returnJson = kuaishouItemCollectSamplesService.getDetail(id);
+            returnJson.put("code", 0);
+            returnJson.put("message", "查询成功");
+        } catch (Exception e) {
+            e.printStackTrace();
+            returnJson.put("code", -1);
+            returnJson.put("message", e.getMessage());
+        }
+        return returnJson;
+    }
+
+
     @PutMapping("/testSubscribe")
     @PutMapping("/testSubscribe")
-    public JSONObject testSubscribe(String phone, String courierNumber) {
+    public JSONObject testSubscribe(String phone, String courierNumber,String code) {
         JSONObject returnJson = new JSONObject();
         JSONObject returnJson = new JSONObject();
         try {
         try {
             SubscribeParameters subscribeParameters = new SubscribeParameters();
             SubscribeParameters subscribeParameters = new SubscribeParameters();
@@ -249,14 +264,13 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             subscribeParameters.setPhone(phone);
             subscribeParameters.setPhone(phone);
             SubscribeParam subscribeParam = new SubscribeParam();
             SubscribeParam subscribeParam = new SubscribeParam();
             subscribeParam.setParameters(subscribeParameters);
             subscribeParam.setParameters(subscribeParameters);
-            subscribeParam.setCompany(CompanyConstant.YD);
+            subscribeParam.setCompany(code);
             subscribeParam.setNumber(courierNumber);
             subscribeParam.setNumber(courierNumber);
             subscribeParam.setKey("BPEQUJxB9244");
             subscribeParam.setKey("BPEQUJxB9244");
             SubscribeReq subscribeReq = new SubscribeReq();
             SubscribeReq subscribeReq = new SubscribeReq();
             subscribeReq.setSchema(ApiInfoConstant.SUBSCRIBE_SCHEMA);
             subscribeReq.setSchema(ApiInfoConstant.SUBSCRIBE_SCHEMA);
             subscribeReq.setParam(new Gson().toJson(subscribeParam));
             subscribeReq.setParam(new Gson().toJson(subscribeParam));
             IBaseClient subscribe = new Subscribe();
             IBaseClient subscribe = new Subscribe();
-
             JSONObject jsonObject = JSONObject.parseObject(subscribe.execute(subscribeReq).getBody());
             JSONObject jsonObject = JSONObject.parseObject(subscribe.execute(subscribeReq).getBody());
             System.err.println(jsonObject);
             System.err.println(jsonObject);
             System.out.println(subscribe.execute(subscribeReq));
             System.out.println(subscribe.execute(subscribeReq));
@@ -274,7 +288,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
     @PostMapping("/callback")
     @PostMapping("/callback")
     public SubscribeResp callback(HttpServletRequest request) {
     public SubscribeResp callback(HttpServletRequest request) {
         SubscribeResp subscribeResp = new SubscribeResp();
         SubscribeResp subscribeResp = new SubscribeResp();
-
         try {
         try {
             String param = request.getParameter("param");
             String param = request.getParameter("param");
             log.info("快递回调信息:{}", param);
             log.info("快递回调信息:{}", param);
@@ -292,7 +305,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                     updateSample.setCourierNumber(nu);
                     updateSample.setCourierNumber(nu);
                     updateSample.setCollectSampleStatus(5);
                     updateSample.setCollectSampleStatus(5);
                     updateSample.setCollectSampleDesc("快递已签收,待上传作业");
                     updateSample.setCollectSampleDesc("快递已签收,待上传作业");
-                  //  kuaishouItemCollectSamplesService.updateByNum(updateSample);
+                    kuaishouItemCollectSamplesService.updateByNum(updateSample);
                 }
                 }
                 JSONArray data = lastResult.getJSONArray("data");
                 JSONArray data = lastResult.getJSONArray("data");
                 KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
                 KuaishouItemCollectSampleExpress express = new KuaishouItemCollectSampleExpress();
@@ -307,7 +320,6 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             subscribeResp.setResult(Boolean.TRUE);
             subscribeResp.setResult(Boolean.TRUE);
             subscribeResp.setReturnCode("200");
             subscribeResp.setReturnCode("200");
             subscribeResp.setMessage("回调成功");
             subscribeResp.setMessage("回调成功");
-
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             subscribeResp.setResult(Boolean.FALSE);
             subscribeResp.setResult(Boolean.FALSE);

+ 5 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouItemCollectSamplesMapper.java

@@ -67,16 +67,18 @@ public interface KuaishouItemCollectSamplesMapper
      */
      */
     public int deleteKuaishouItemCollectSamplesByIds(Long[] ids);
     public int deleteKuaishouItemCollectSamplesByIds(Long[] ids);
 
 
-    List<JSONObject> getItemList(JSONArray itemIds);
+    List<JSONObject> getItemList(@Param("itemIds") JSONArray itemIds);
 
 
-    List<JSONObject> promoterList(JSONArray promoterIds);
+    List<JSONObject> promoterList(@Param("promoterIds") JSONArray promoterIds);
 
 
     Integer check(@Param("itemId") Long itemId,@Param("promoterId") Long promoterId);
     Integer check(@Param("itemId") Long itemId,@Param("promoterId") Long promoterId);
 
 
     void batchAdd(@Param(value = "adds") List<KuaishouItemCollectSamples> adds);
     void batchAdd(@Param(value = "adds") List<KuaishouItemCollectSamples> adds);
 
 
-    void KuaishouItemCollectSamples(KuaishouItemCollectSamples updateSample);
+    void updateByNum(KuaishouItemCollectSamples updateSample);
 
 
     void replaceExpress(KuaishouItemCollectSampleExpress express);
     void replaceExpress(KuaishouItemCollectSampleExpress express);
+
+    KuaishouItemCollectSampleExpress getExpress(@Param("courierNumber") String courierNumber);
 }
 }
 
 

+ 8 - 6
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouItemCollectSamplesService.java

@@ -25,14 +25,14 @@ public interface IKuaishouItemCollectSamplesService
      * @param id 【请填写功能名称】主键
      * @param id 【请填写功能名称】主键
      * @return 【请填写功能名称】
      * @return 【请填写功能名称】
      */
      */
-    public KuaishouItemCollectSamples selectKuaishouItemCollectSamplesById(Long id);
+     KuaishouItemCollectSamples selectKuaishouItemCollectSamplesById(Long id);
 
 
     /**
     /**
      * 查询【请填写功能名称】列表
      * 查询【请填写功能名称】列表
      *
      *
      * @return 【请填写功能名称】集合
      * @return 【请填写功能名称】集合
      */
      */
-    public List<KuaishouItemCollectSamples> selectKuaishouItemCollectSamplesList(Map<String,Object> requestMap);
+     List<KuaishouItemCollectSamples> selectKuaishouItemCollectSamplesList(Map<String,Object> requestMap);
 
 
     /**
     /**
      * 新增【请填写功能名称】
      * 新增【请填写功能名称】
@@ -40,7 +40,7 @@ public interface IKuaishouItemCollectSamplesService
      * @param kuaishouItemCollectSamples 【请填写功能名称】
      * @param kuaishouItemCollectSamples 【请填写功能名称】
      * @return 结果
      * @return 结果
      */
      */
-    public int insertKuaishouItemCollectSamples(KuaishouItemCollectSamples kuaishouItemCollectSamples);
+     int insertKuaishouItemCollectSamples(KuaishouItemCollectSamples kuaishouItemCollectSamples);
 
 
     /**
     /**
      * 修改【请填写功能名称】
      * 修改【请填写功能名称】
@@ -48,7 +48,7 @@ public interface IKuaishouItemCollectSamplesService
      * @param kuaishouItemCollectSamples 【请填写功能名称】
      * @param kuaishouItemCollectSamples 【请填写功能名称】
      * @return 结果
      * @return 结果
      */
      */
-    public int updateKuaishouItemCollectSamples(KuaishouItemCollectSamples kuaishouItemCollectSamples);
+     int updateKuaishouItemCollectSamples(KuaishouItemCollectSamples kuaishouItemCollectSamples);
 
 
     /**
     /**
      * 批量删除【请填写功能名称】
      * 批量删除【请填写功能名称】
@@ -56,7 +56,7 @@ public interface IKuaishouItemCollectSamplesService
      * @param ids 需要删除的【请填写功能名称】主键集合
      * @param ids 需要删除的【请填写功能名称】主键集合
      * @return 结果
      * @return 结果
      */
      */
-    public int deleteKuaishouItemCollectSamplesByIds(Long[] ids);
+     int deleteKuaishouItemCollectSamplesByIds(Long[] ids);
 
 
     /**
     /**
      * 删除【请填写功能名称】信息
      * 删除【请填写功能名称】信息
@@ -64,7 +64,7 @@ public interface IKuaishouItemCollectSamplesService
      * @param id 【请填写功能名称】主键
      * @param id 【请填写功能名称】主键
      * @return 结果
      * @return 结果
      */
      */
-    public int deleteKuaishouItemCollectSamplesById(Long id);
+     int deleteKuaishouItemCollectSamplesById(Long id);
 
 
 
 
     JSONObject preview(Long userId, String nickName, JSONArray itemIds, JSONArray promoterIds);
     JSONObject preview(Long userId, String nickName, JSONArray itemIds, JSONArray promoterIds);
@@ -76,5 +76,7 @@ public interface IKuaishouItemCollectSamplesService
     void updateByNum(KuaishouItemCollectSamples updateSample);
     void updateByNum(KuaishouItemCollectSamples updateSample);
 
 
     void replaceExpress(KuaishouItemCollectSampleExpress express);
     void replaceExpress(KuaishouItemCollectSampleExpress express);
+
+    JSONObject getDetail(Long id);
 }
 }
 
 

+ 40 - 22
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java

@@ -21,6 +21,7 @@ import com.ruixuan.isc.service.IKuaishouItemCollectSamplesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.security.auth.callback.CallbackHandler;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
@@ -135,7 +136,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                 }
                 }
                 JSONObject sampleJson = new JSONObject();
                 JSONObject sampleJson = new JSONObject();
                 sampleJson.put("itemId", itemJson.getLong("itemId"));
                 sampleJson.put("itemId", itemJson.getLong("itemId"));
-                sampleJson.put("itemTitle", itemJson.getLong("itemTitle"));
+                sampleJson.put("itemTitle", itemJson.getString("itemTitle"));
                 sampleJson.put("itemPrice", itemJson.getLong("itemPrice"));
                 sampleJson.put("itemPrice", itemJson.getLong("itemPrice"));
                 sampleJson.put("itemImgUrl", itemJson.getString("itemImgUrl"));
                 sampleJson.put("itemImgUrl", itemJson.getString("itemImgUrl"));
                 sampleJson.put("commissionRate", itemJson.getLong("commissionRate"));
                 sampleJson.put("commissionRate", itemJson.getLong("commissionRate"));
@@ -169,25 +170,27 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         for (int i = 0; i < temCollectSamples.size(); i++) {
         for (int i = 0; i < temCollectSamples.size(); i++) {
             JSONObject sampleJson = temCollectSamples.getJSONObject(i);
             JSONObject sampleJson = temCollectSamples.getJSONObject(i);
             KuaishouItemCollectSamples sample = new KuaishouItemCollectSamples();
             KuaishouItemCollectSamples sample = new KuaishouItemCollectSamples();
-            sample.setItemId(sampleJson.getLong("item_id"));
-            sample.setItemTitle(sampleJson.getString("item_title"));
-            sample.setItemPrice(sampleJson.getLong("item_price"));
-            sample.setItemImgUrl(sampleJson.getString("item_img_url"));
-            sample.setItemDesc(sampleJson.getString("item_desc"));
-            sample.setCommissionRate(sampleJson.getLong("commission_rate"));
-            sample.setRegimentalPromotion(sampleJson.getLong("regimental_promotion"));
-            sample.setSampleCount(sampleJson.getInteger("sample_count"));
-            sample.setSampleRequirement(sampleJson.getString("sample_requirement"));
-            sample.setItemId(sampleJson.getLong("item_create_id"));
-            sample.setItemCreateName(sampleJson.getString("item_create_name"));
-            sample.setCollectSampleId(sampleJson.getLong("collect_sample_id"));
-            sample.setCollectSampleName(sampleJson.getString("collect_sample_name"));
-            sample.setPartnerRecommendText(sampleJson.getString("partner_recommend_text"));
-            sample.setPromoterId(sampleJson.getLong("promoter_id"));
-            sample.setPromoterPhone(sampleJson.getString("promoter_phone"));
-            sample.setPromoterAddress(sampleJson.getString("promoter_address"));
-            sample.setCollectSampleStatus(sampleJson.getInteger("collect_sample_status"));
-            sample.setCollectSampleDesc(sampleJson.getString("collect_sample_desc"));
+            sample.setItemId(sampleJson.getLong("itemId"));
+            sample.setItemTitle(sampleJson.getString("itemTitle"));
+            sample.setItemPrice(sampleJson.getLong("itemPrice"));
+            sample.setItemImgUrl(sampleJson.getString("itemImgUrl"));
+            sample.setItemDesc(sampleJson.getString("itemDesc"));
+            sample.setCommissionRate(sampleJson.getLong("commissionRate"));
+            sample.setRegimentalPromotion(sampleJson.getLong("regimentalPromotion"));
+            sample.setSampleCount(sampleJson.getInteger("sampleCount"));
+            sample.setSampleRequirement(sampleJson.getString("sampleRequirement"));
+            sample.setItemCreateId(sampleJson.getLong("itemCreateId"));
+            sample.setItemCreateName(sampleJson.getString("itemCreateName"));
+            sample.setCollectSampleId(sampleJson.getLong("collectSampleId"));
+            sample.setCollectSampleName(sampleJson.getString("collectSampleName"));
+            sample.setPartnerRecommendText(sampleJson.getString("partnerRecommendText"));
+            sample.setPromoterId(sampleJson.getLong("promoterId"));
+            sample.setPromoterPhone(sampleJson.getString("promoterPhone"));
+            sample.setPromoterAddress(sampleJson.getString("promoterAddress"));
+            sample.setCollectSampleStatus(sampleJson.getInteger("collectSampleStatus"));
+            sample.setCollectSampleDesc(sampleJson.getString("collectSampleDesc"));
+            sample.setPromoterNickName(sampleJson.getString("promoterNickName"));
+            sample.setPromoterUrl(sampleJson.getString("promoterUrl"));
             adds.add(sample);
             adds.add(sample);
         }
         }
         if (!Check.isNull(adds)) {
         if (!Check.isNull(adds)) {
@@ -198,7 +201,6 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
 
 
     @Override
     @Override
     public void subscribe(Long id, String courierNumber, String code) throws Exception {
     public void subscribe(Long id, String courierNumber, String code) throws Exception {
-
         KuaishouItemCollectSamples samples = kuaishouItemCollectSamplesMapper.selectKuaishouItemCollectSamplesById(id);
         KuaishouItemCollectSamples samples = kuaishouItemCollectSamplesMapper.selectKuaishouItemCollectSamplesById(id);
         SubscribeParameters subscribeParameters = new SubscribeParameters();
         SubscribeParameters subscribeParameters = new SubscribeParameters();
         subscribeParameters.setCallbackurl("http://ruixuan.api.tjyourong.com.cn/itemCollectSamples/callback");
         subscribeParameters.setCallbackurl("http://ruixuan.api.tjyourong.com.cn/itemCollectSamples/callback");
@@ -227,7 +229,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
 
 
     @Override
     @Override
     public void updateByNum(KuaishouItemCollectSamples updateSample) {
     public void updateByNum(KuaishouItemCollectSamples updateSample) {
-        kuaishouItemCollectSamplesMapper.KuaishouItemCollectSamples(updateSample);
+        kuaishouItemCollectSamplesMapper.updateByNum(updateSample);
     }
     }
 
 
     @Override
     @Override
@@ -235,6 +237,22 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         kuaishouItemCollectSamplesMapper.replaceExpress(express);
         kuaishouItemCollectSamplesMapper.replaceExpress(express);
     }
     }
 
 
+    @Override
+    public JSONObject getDetail(Long id) {
+        JSONObject json = new JSONObject();
+        KuaishouItemCollectSamples sample = kuaishouItemCollectSamplesMapper.selectKuaishouItemCollectSamplesById(id);
+        json.put("sample", sample);
+        if (!Check.isNull(sample.getCourierNumber())) {
+            KuaishouItemCollectSampleExpress express = kuaishouItemCollectSamplesMapper.getExpress(sample.getCourierNumber());
+            if (!Check.isNull(express)) {
+                json.put("express", express);
+            }
+        }
+
+
+        return json;
+    }
+
 
 
 }
 }
 
 

+ 26 - 20
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml

@@ -82,19 +82,19 @@
         item_price as 'itemPrice',
         item_price as 'itemPrice',
         item_img_url as 'itemImgUrl',
         item_img_url as 'itemImgUrl',
         regimental_promotion as 'regimentalPromotion',
         regimental_promotion as 'regimentalPromotion',
+        commission_rate as 'commissionRate',
         user_id as 'userId',
         user_id as 'userId',
         user_name as 'userName'
         user_name as 'userName'
         from kuaishou_item_list
         from kuaishou_item_list
         where 1 =1
         where 1 =1
         <if test='itemIds != null and itemIds.size() > 0'>
         <if test='itemIds != null and itemIds.size() > 0'>
             AND item_id in
             AND item_id in
-            <foreach collection="itemIds" item="item" separator=","
+            <foreach collection="itemIds" item="itemId" separator=","
                      open="(" close=")">
                      open="(" close=")">
-                #{item}
+                #{itemId}
             </foreach>
             </foreach>
         </if>
         </if>
-        group item_id
-
+        group by item_id
     </select>
     </select>
     <select id="promoterList" resultType="com.alibaba.fastjson.JSONObject"
     <select id="promoterList" resultType="com.alibaba.fastjson.JSONObject"
             parameterType="com.alibaba.fastjson.JSONArray">
             parameterType="com.alibaba.fastjson.JSONArray">
@@ -102,17 +102,18 @@
         promoter_id as 'promoterId',
         promoter_id as 'promoterId',
         promoter_nick_name as 'promoterNickName',
         promoter_nick_name as 'promoterNickName',
         promoter_url as 'promoterUrl',
         promoter_url as 'promoterUrl',
-        promoter_address as 'promoterAddress',
+        concat(province,'-',promoter_address) as 'promoterAddress',
+        phone as 'promoterPhone'
         from kuaishou_promoter
         from kuaishou_promoter
         where 1 =1
         where 1 =1
-        <if test='itemIds != null and itemIds.size() > 0'>
+        <if test='promoterIds != null and promoterIds.size() > 0'>
             AND promoter_id in
             AND promoter_id in
-            <foreach collection="promoterIds" item="item" separator=","
+            <foreach collection="promoterIds" item="promoterId" separator=","
                      open="(" close=")">
                      open="(" close=")">
-                #{item}
+                #{promoterId}
             </foreach>
             </foreach>
         </if>
         </if>
-        group promoter_id
+        group by promoter_id
     </select>
     </select>
     <select id="check" resultType="java.lang.Integer">
     <select id="check" resultType="java.lang.Integer">
         select count(1)  from kuaishou_item_collect_samples
         select count(1)  from kuaishou_item_collect_samples
@@ -120,6 +121,11 @@
         and promoter_id = #{promoterId}
         and promoter_id = #{promoterId}
 
 
     </select>
     </select>
+    <select id="getExpress" resultType="com.ruixuan.isc.entity.KuaishouItemCollectSampleExpress"
+            parameterType="java.lang.String">
+        select *  from kuaishou_item_collect_sample_express where  courier_number = #{courierNumber}
+
+    </select>
 
 
 
 
     <insert id="insertKuaishouItemCollectSamples" parameterType="com.ruixuan.isc.entity.KuaishouItemCollectSamples">
     <insert id="insertKuaishouItemCollectSamples" parameterType="com.ruixuan.isc.entity.KuaishouItemCollectSamples">
@@ -183,7 +189,6 @@
     </insert>
     </insert>
     <insert id="batchAdd">
     <insert id="batchAdd">
         insert into kuaishou_item_collect_samples(
         insert into kuaishou_item_collect_samples(
-        id,
         item_id,
         item_id,
         item_title,
         item_title,
         item_price,
         item_price,
@@ -204,6 +209,7 @@
         promoter_address,
         promoter_address,
         courier_number,
         courier_number,
         task_file_url,
         task_file_url,
+        promoter_url,
         collect_sample_status,
         collect_sample_status,
         collect_sample_desc
         collect_sample_desc
         )
         )
@@ -216,7 +222,7 @@
             #{add.itemImgUrl},
             #{add.itemImgUrl},
             #{add.itemDesc},
             #{add.itemDesc},
             #{add.commissionRate},
             #{add.commissionRate},
-            #{add.regimentalOromotion},
+            #{add.regimentalPromotion},
             #{add.sampleCount},
             #{add.sampleCount},
             #{add.sampleRequirement},
             #{add.sampleRequirement},
             #{add.itemCreateId},
             #{add.itemCreateId},
@@ -230,6 +236,7 @@
             #{add.promoterAddress},
             #{add.promoterAddress},
             #{add.courierNumber},
             #{add.courierNumber},
             #{add.taskFileUrl},
             #{add.taskFileUrl},
+            #{add.promoterUrl},
             #{add.collectSampleStatus },
             #{add.collectSampleStatus },
             #{add.collectSampleDesc}
             #{add.collectSampleDesc}
             )
             )
@@ -237,20 +244,19 @@
 
 
     </insert>
     </insert>
     <insert id="replaceExpress" parameterType="com.ruixuan.isc.entity.KuaishouItemCollectSampleExpress">
     <insert id="replaceExpress" parameterType="com.ruixuan.isc.entity.KuaishouItemCollectSampleExpress">
-
-        replace into kuaishou_item_collect_sample_express
-        <trim prefix="(" suffix=")" suffixOverrides=",">
+        replace into kuaishou_item_collect_sample_express(
             courier_number,
             courier_number,
             com,
             com,
             state,
             state,
             express_data
             express_data
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            #{courier_number},
+        )
+        values
+       (
+            #{courierNumber},
             #{com},
             #{com},
             #{state},
             #{state},
-            #{express_data}
-        </trim>
+            #{expressData}
+       )
 
 
     </insert>
     </insert>
 
 
@@ -285,7 +291,7 @@
         </trim>
         </trim>
         where id = #{id}
         where id = #{id}
     </update>
     </update>
-    <update id="KuaishouItemCollectSamples" parameterType="com.ruixuan.isc.entity.KuaishouItemCollectSamples">
+    <update id="updateByNum" parameterType="com.ruixuan.isc.entity.KuaishouItemCollectSamples">
         update kuaishou_item_collect_samples
         update kuaishou_item_collect_samples
         <trim prefix="SET" suffixOverrides=",">
         <trim prefix="SET" suffixOverrides=",">
             <if test="collectSampleStatus != null">collect_sample_status = #{collectSampleStatus},</if>
             <if test="collectSampleStatus != null">collect_sample_status = #{collectSampleStatus},</if>