|
@@ -17,6 +17,7 @@ import com.slodon.b2b2c.goods.pojo.Goods;
|
|
|
import com.slodon.b2b2c.goods.pojo.GoodsPicture;
|
|
|
import com.slodon.b2b2c.goods.pojo.Product;
|
|
|
import com.slodon.b2b2c.investment.constant.InvestmentConst;
|
|
|
+import com.slodon.b2b2c.model.seller.StoreModel;
|
|
|
import com.slodon.b2b2c.model.seller.VendorModel;
|
|
|
import com.slodon.b2b2c.seller.pojo.Vendor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -43,6 +44,9 @@ public class ProductModel {
|
|
|
private VendorModel vendorModel;
|
|
|
|
|
|
@Resource
|
|
|
+ private StoreModel storeModel;
|
|
|
+
|
|
|
+ @Resource
|
|
|
private GoodsPictureModel goodsPictureModel;
|
|
|
|
|
|
@Resource
|
|
@@ -209,8 +213,11 @@ public class ProductModel {
|
|
|
String regex = ".*token=([^&]*).*";
|
|
|
HashMap<String, String> headers = new HashMap<>();
|
|
|
headers.put(InvestmentConst.CONTENT_TYPE, InvestmentConst.APPLICATION_JSON);
|
|
|
- if (!StringUtil.isBlank(vendor.getStoreUrlBy9710())){
|
|
|
+ if (!StringUtil.isBlank(vendor.getStoreUrlBy9710())) {
|
|
|
headers.put(InvestmentConst.AUTHORIZATION, "Token " + vendor.getStoreUrlBy9710().replaceFirst(regex, "$1"));
|
|
|
+ } else {
|
|
|
+ JSONObject jsonObject = storeModel.getStoreUrlsObject(vendor.getStoreId(), vendor.getVendorName());
|
|
|
+ headers.put(InvestmentConst.AUTHORIZATION, "Token " + jsonObject.getStr("9710").replaceFirst(regex, "$1"));
|
|
|
}
|
|
|
|
|
|
JSONObject param = new JSONObject();
|