|
|
@@ -21,6 +21,7 @@ import com.ruixuan.isc.service.IKuaishouItemCollectSamplesService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import javax.security.auth.callback.CallbackHandler;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
@@ -135,7 +136,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
JSONObject sampleJson = new JSONObject();
|
|
|
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("itemImgUrl", itemJson.getString("itemImgUrl"));
|
|
|
sampleJson.put("commissionRate", itemJson.getLong("commissionRate"));
|
|
|
@@ -169,25 +170,27 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
for (int i = 0; i < temCollectSamples.size(); i++) {
|
|
|
JSONObject sampleJson = temCollectSamples.getJSONObject(i);
|
|
|
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);
|
|
|
}
|
|
|
if (!Check.isNull(adds)) {
|
|
|
@@ -198,7 +201,6 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
|
|
|
@Override
|
|
|
public void subscribe(Long id, String courierNumber, String code) throws Exception {
|
|
|
-
|
|
|
KuaishouItemCollectSamples samples = kuaishouItemCollectSamplesMapper.selectKuaishouItemCollectSamplesById(id);
|
|
|
SubscribeParameters subscribeParameters = new SubscribeParameters();
|
|
|
subscribeParameters.setCallbackurl("http://ruixuan.api.tjyourong.com.cn/itemCollectSamples/callback");
|
|
|
@@ -227,7 +229,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
|
|
|
@Override
|
|
|
public void updateByNum(KuaishouItemCollectSamples updateSample) {
|
|
|
- kuaishouItemCollectSamplesMapper.KuaishouItemCollectSamples(updateSample);
|
|
|
+ kuaishouItemCollectSamplesMapper.updateByNum(updateSample);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -235,6 +237,22 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
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;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|
|
|
|