|
|
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.uas.platform.b2b.dao.VendorDao;
|
|
|
+import com.uas.platform.b2b.erp.model.VendorInfo;
|
|
|
import com.uas.platform.b2b.erp.model.VendorRate;
|
|
|
import com.uas.platform.b2b.erp.support.ErpBufferedLogger;
|
|
|
import com.uas.platform.b2b.model.Vendor;
|
|
|
@@ -29,7 +30,7 @@ public class VendorRateController {
|
|
|
private VendorDao vendorDao;
|
|
|
|
|
|
/**
|
|
|
- * 平台的应收对账传到供应商ERP之后,修改平台里面的订单的上传状态
|
|
|
+ * 上传供应商费率
|
|
|
*
|
|
|
* @return
|
|
|
* @throws UnsupportedEncodingException
|
|
|
@@ -69,14 +70,14 @@ public class VendorRateController {
|
|
|
@ResponseBody
|
|
|
public void uploadB2BApcheck(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
|
- List<VendorRate> rates = JSONArray.parseArray(jsonStr, VendorRate.class);
|
|
|
- logger.log("供应商资料", "设置是否启用平台对账功能", rates.size());
|
|
|
- if (!CollectionUtils.isEmpty(rates)) {
|
|
|
- for (VendorRate rate : rates) {
|
|
|
- List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(rate.getCustuu(), rate.getVenduu());
|
|
|
+ List<VendorInfo> infos = JSONArray.parseArray(jsonStr, VendorInfo.class);
|
|
|
+ logger.log("供应商资料", "设置是否启用平台对账功能", infos.size());
|
|
|
+ if (!CollectionUtils.isEmpty(infos)) {
|
|
|
+ for (VendorInfo info : infos) {
|
|
|
+ List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(info.getCustuu(), info.getVenduu());
|
|
|
if (!CollectionUtils.isEmpty(vendors)) {
|
|
|
for (Vendor vendor : vendors) {
|
|
|
- vendor.setApcheck(rate.getApcheck());
|
|
|
+ vendor.setApcheck(info.getApcheck());
|
|
|
vendorDao.save(vendor);
|
|
|
}
|
|
|
}
|