|
@@ -81,21 +81,21 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
@Override
|
|
|
public List<KuaishouItemCollectSamples> selectKuaishouItemCollectSamplesList(Map<String, Object> requestMap) {
|
|
|
List<KuaishouItemCollectSamples> kuaishouItemCollectSamples = kuaishouItemCollectSamplesMapper.selectKuaishouItemCollectSamplesList(requestMap);
|
|
|
- Map<Long, JSONObject> dataMap = new HashMap<>();
|
|
|
+ Map<String, JSONObject> dataMap = new HashMap<>();
|
|
|
if (!Check.isNull(kuaishouItemCollectSamples)) {
|
|
|
- Map<Long, Long> map = new HashMap<>();
|
|
|
+ Map<String, String> map = new HashMap<>();
|
|
|
for (KuaishouItemCollectSamples samples : kuaishouItemCollectSamples) {
|
|
|
- map.put(samples.getPromoterId(), samples.getPromoterId());
|
|
|
+ map.put(samples.getPromoterId() + "", samples.getPromoterId() + "");
|
|
|
}
|
|
|
List<JSONObject> promoterList = kuaishouItemCollectSamplesMapper.selectPromoterInfo(map);
|
|
|
for (int i = 0; i < promoterList.size(); i++) {
|
|
|
JSONObject jsonObject = promoterList.get(i);
|
|
|
- dataMap.put(jsonObject.getLong("promoterId"), jsonObject);
|
|
|
+ dataMap.put(jsonObject.getString("promoterId"), jsonObject);
|
|
|
}
|
|
|
}
|
|
|
if (!Check.isNull(kuaishouItemCollectSamples)) {
|
|
|
for (KuaishouItemCollectSamples samples : kuaishouItemCollectSamples) {
|
|
|
- Long promoterId = samples.getPromoterId();
|
|
|
+ String promoterId = samples.getPromoterId();
|
|
|
JSONObject jsonObject = dataMap.get(promoterId);
|
|
|
if (!Check.isNull(jsonObject)) {
|
|
|
samples.setValidAmount(jsonObject.getLong("validAmount"));
|
|
@@ -182,7 +182,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
|
|
|
Long relateId = itemJson.getLong("relateId");
|
|
|
- Long promoterId = promoterJson.getLong("promoterId");
|
|
|
+ String promoterId = promoterJson.getString("promoterId");
|
|
|
Integer count = kuaishouItemCollectSamplesMapper.checkByRelateIdAndPromoterId(relateId, promoterId);
|
|
|
if (count > 0) {
|
|
|
sampleReceivedCount++;
|
|
@@ -231,7 +231,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
JSONObject sampleJson = temCollectSamples.getJSONObject(i);
|
|
|
KuaishouItemCollectSamples sample = new KuaishouItemCollectSamples();
|
|
|
Long itemId = sampleJson.getLong("itemId");
|
|
|
- Long promoterId = sampleJson.getLong("promoterId");
|
|
|
+ String promoterId = sampleJson.getString("promoterId");
|
|
|
Integer check = kuaishouItemCollectSamplesMapper.check(itemId, promoterId);
|
|
|
if (check > 0) {
|
|
|
continue;
|
|
@@ -371,7 +371,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public JSONObject getCopyInfo(Long promoterId) {
|
|
|
+ public JSONObject getCopyInfo(String promoterId) {
|
|
|
JSONObject returnJson = kuaishouItemCollectSamplesMapper.promoterInfo(promoterId);
|
|
|
return returnJson;
|
|
|
}
|