|
@@ -772,7 +772,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
|
|
|
@GetMapping("/samplesCheck")
|
|
|
@ResponseBody
|
|
|
- public JSONObject samplesCheck(Long itemId, Long promoterId,Long userId) {
|
|
|
+ public JSONObject samplesCheck(Long itemId, Long promoterId, Long userId) {
|
|
|
JSONObject returnJson = new JSONObject();
|
|
|
try {
|
|
|
|
|
@@ -791,9 +791,16 @@ public class KuaishouItemCollectSamplesController extends BaseController {
|
|
|
throw new Exception("该达人未录入");
|
|
|
}
|
|
|
|
|
|
+ Long id = null;
|
|
|
+ KuaishouPromoter userPromoterInfo = promoterService.getOnlyPromoterInfoByUserId(promoterId, userId);
|
|
|
+ if (!Check.isNull(userPromoterInfo)) {
|
|
|
+ id = userPromoterInfo.getId();
|
|
|
+ } else {
|
|
|
+ id = onlyPromoterInfo.getId();
|
|
|
+ }
|
|
|
returnJson.put("code", 0);
|
|
|
returnJson.put("message", "校验通过");
|
|
|
- returnJson.put("id", onlyPromoterInfo.getId());
|
|
|
+ returnJson.put("id", id);
|
|
|
} catch (Exception e) {
|
|
|
returnJson.put("code", 500);
|
|
|
returnJson.put("message", e.getMessage());
|