代采订单明细数量更新为double型

src/main/java/com/uas/platform/b2b/controller/DeputyOrderController.java

@@ -120,12 +120,11 @@ public class DeputyOrderController {
 	/**
 	 * 保存代采订单
 	 * 
-	 * @param deOrder
+	 * @param deorder
 	 * @return
 	 */
 	@RequestMapping(value = "/edit/saveDeOrder", method = RequestMethod.POST)
-	public ModelMap saveDeOrder(@RequestBody String deOrder) {
-		DeputyOrder deorder = JSON.parseObject(deOrder, DeputyOrder.class);
+	public ModelMap saveDeOrder(@RequestBody DeputyOrder deorder) {
 		deorder.setEntrystatus("保存");
 		return deputyOrderService.saveDeOrder(deorder);
 	}
@@ -133,12 +132,11 @@ public class DeputyOrderController {
 	/**
 	 * 提交代采订单
 	 *
-	 * @param deOrder
+	 * @param deorder
 	 * @return
 	 */
 	@RequestMapping(value = "/submit/saveDeOrder", method = RequestMethod.POST)
-	public ModelMap submitDeOrder(@RequestBody String deOrder) {
-		DeputyOrder deorder = JSON.parseObject(deOrder, DeputyOrder.class);
+	public ModelMap submitDeOrder(@RequestBody DeputyOrder deorder) {
 		deorder.setEntrystatus("已提交");
 		return deputyOrderService.saveDeOrder(deorder);
 	}

src/main/java/com/uas/platform/b2b/model/DeputyOrderItem.java

@@ -68,7 +68,7 @@ public class DeputyOrderItem implements Serializable {
 	 * 数量
 	 */
 	@Column(name = "dei_amount")
-	private Integer amount;
+	private Double amount;
 	
 	/**
 	 * 单价
@@ -145,11 +145,11 @@ public class DeputyOrderItem implements Serializable {
 		this.prodspec = prodspec;
 	}
 
-	public Integer getAmount() {
+	public Double getAmount() {
 		return amount;
 	}
 
-	public void setAmount(Integer amount) {
+	public void setAmount(Double amount) {
 		this.amount = amount;
 	}
 

src/main/java/com/uas/platform/b2b/service/impl/DeputyOrderServiceImpl.java

@@ -18,6 +18,7 @@ import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
@@ -175,51 +176,16 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		if (flag) {
 			// 金额保留两位小数
 			DecimalFormat df = new java.text.DecimalFormat("#.00");
-			order.setActualpaydate(deorder.getActualpaydate());
-			order.setActusdpayment(deorder.getActusdpayment());
-			order.setBankaccount(deorder.getBankaccount());
-			order.setBankaddress(deorder.getBankaddress());
-			order.setBankcode(deorder.getBankcode());
-			order.setBankname(deorder.getBankname());
-			order.setCode(deorder.getCode());
-			order.setCompanyname(deorder.getCompanyname());
-			order.setCustomer(deorder.getCustomer());
-			order.setDeliverydate(deorder.getDeliverydate());
-			order.setDeliverymethod(deorder.getDeliverymethod());
-			order.setEnaddress(deorder.getEnaddress());
-			order.setEnfax(deorder.getEnfax());
-			order.setEntrydate(deorder.getEntrydate());
-			order.setGoodspacking(deorder.getGoodspacking());
-			order.setLegalrepresent(deorder.getLegalrepresent());
-			order.setMadealcode(deorder.getMadealcode());
-			order.setMadealdate(deorder.getMadealdate());
+			BeanUtils.copyProperties(deorder, order, DeputyOrder.class);
 			order.setDate(new Date());
-			order.setPaydate(deorder.getPaydate());
-			order.setPaydeldate(deorder.getPaydeldate());
-			order.setPaymentdate(deorder.getPaymentdate());
-			order.setPaymentmethod(deorder.getPaymentmethod());
-			order.setPickupmethod(deorder.getPickupmethod());
-			order.setProstatus(deorder.getProstatus());
-			order.setProstatuscode(deorder.getProstatuscode());
-			order.setRequirepaydate(deorder.getRequirepaydate());
-			order.setRiskmethod(deorder.getRiskmethod());
-			order.setShipdate(deorder.getShipdate());
 			order.setDownloadstatus("未下载");
-			order.setSalecode(deorder.getSalecode());
-			order.setSalepocode(deorder.getSalepocode());
 			if(null != deorder.getOrderamount()) {//存在金额为空值的情况
                 order.setOrderamount(Double.valueOf(df.format(deorder.getOrderamount())));
             }
-			order.setPaymethod(deorder.getPaymethod());
-			order.setDeputyname(deorder.getDeputyname());
 			if (deorder.getStatus().equals("在录入")) {
 				order.setStatus(Status.UNAUDIT.getPhrase());
 				order.setStatuscode(Status.UNAUDIT.value());
 			}
-			order.setTaxpaymentmethod(deorder.getTaxpaymentmethod());
-			order.setTervendaddress(deorder.getTervendaddress());
-			order.setTervendor(deorder.getTervendor());
-			order.setTervenduu(deorder.getTervenduu());
 			if(null != deorder.getTotalamount()) {
                 order.setTotalamount(Double.valueOf(df.format(deorder.getTotalamount())));
             }
@@ -229,20 +195,6 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
             if(null != deorder.getUsdpayment()) {
                 order.setUsdpayment(Double.valueOf(df.format(deorder.getUsdpayment())));
             }
-			order.setUsertel(deorder.getUsertel());
-			order.setVendtel(deorder.getVendtel());
-			order.setVenduser(deorder.getVenduser());
-			order.setVenduseruu(deorder.getVenduseruu());
-			order.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-			order.setUseruu(SystemSession.getUser().getUserUU());
-			order.setEntrystatus(deorder.getEntrystatus());
-			order.setDeputyuu(deorder.getDeputyuu());// TODO
-			order.setPaycomaddress(deorder.getPaycomaddress());
-			order.setPaycomname(deorder.getPaycomname());
-			order.setRate(deorder.getRate());
-			order.setCurrency(deorder.getCurrency());
-			order.setOtherdata(deorder.getOtherdata());
-			order.setPickupdate(deorder.getPickupdate());
 			order = deputyOrderDao.save(order);
 			int i = 1;
 			List<DeputyOrderItem> items = new ArrayList<DeputyOrderItem>();