소스 검색

增加设置启用b2b对账功能

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7355 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 년 전
부모
커밋
e36970b5e9

+ 8 - 7
src/main/java/com/uas/platform/b2b/erp/controller/VendorRateController.java

@@ -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);
 					}
 				}

+ 53 - 0
src/main/java/com/uas/platform/b2b/erp/model/VendorInfo.java

@@ -0,0 +1,53 @@
+package com.uas.platform.b2b.erp.model;
+
+/**
+ * 更新供应商rate
+ * 
+ * @author hejq
+ * @time 创建时间:2017年3月27日
+ */
+public class VendorInfo {
+
+	/**
+	 * 供应商uu
+	 */
+	private Long venduu;
+
+	/**
+	 * 客户uu
+	 */
+	private Long custuu;
+
+	/**
+	 * 是否启用b2b对账<br>
+	 * 1. 启用 <br>
+	 * 2. 未启用
+	 * 
+	 */
+	private Short apcheck;
+
+	public Long getVenduu() {
+		return venduu;
+	}
+
+	public void setVenduu(Long venduu) {
+		this.venduu = venduu;
+	}
+
+	public Long getCustuu() {
+		return custuu;
+	}
+
+	public void setCustuu(Long custuu) {
+		this.custuu = custuu;
+	}
+
+	public Short getApcheck() {
+		return apcheck;
+	}
+
+	public void setApcheck(Short apcheck) {
+		this.apcheck = apcheck;
+	}
+
+}

+ 11 - 0
src/main/java/com/uas/platform/b2b/erp/model/VendorRate.java

@@ -8,8 +8,19 @@ package com.uas.platform.b2b.erp.model;
  */
 public class VendorRate {
 
+	/**
+	 * 供应商uu
+	 */
 	private Long venduu;
+
+	/**
+	 * 客户uu
+	 */
 	private Long custuu;
+
+	/**
+	 * 费率
+	 */
 	private Double rate;
 
 	public Long getVenduu() {