代采订单方法规范调整

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

@@ -199,31 +199,33 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 			order.setDownloadstatus("未下载");
 			order.setEnuu(SystemSession.getUser().getEnterprise().getUu());
 			order.setUseruu(SystemSession.getUser().getUserUU());
-			if(null != deorder.getOrderamount()) {//存在金额为空值的情况
+            //存在金额为空值的情况
+			if (null != deorder.getOrderamount()) {
                 order.setOrderamount(Double.valueOf(df.format(deorder.getOrderamount())));
             }
-			if (deorder.getStatus().equals("在录入")) {
+            String entryStatus = "在录入";
+			if (entryStatus.equals(deorder.getStatus())) {
 				order.setStatus(Status.UNAUDIT.getPhrase());
 				order.setStatuscode(Status.UNAUDIT.value());
 			}
-			if(null != deorder.getTotalamount()) {
+			if (null != deorder.getTotalamount()) {
                 order.setTotalamount(Double.valueOf(df.format(deorder.getTotalamount())));
             }
-            if(null != deorder.getTotalpayament()) {
+            if (null != deorder.getTotalpayament()) {
                 order.setTotalpayament(Double.valueOf(df.format(deorder.getTotalpayament())));
             }
-            if(null != deorder.getUsdpayment()) {
+            if (null != deorder.getUsdpayment()) {
                 order.setUsdpayment(Double.valueOf(df.format(deorder.getUsdpayment())));
             }
 			order = deputyOrderDao.save(order);
 			int i = 1;
-			List<DeputyOrderItem> items = new ArrayList<DeputyOrderItem>();
+			List<DeputyOrderItem> items = new ArrayList<>();
 			if (order.getId() != null) {
 				if (!CollectionUtils.isEmpty(deorder.getDeputyOrderItems())) {
 					for (DeputyOrderItem item : deorder.getDeputyOrderItems()) {
-						Double totalprice = item.getUnitprice() * item.getAmount();
+						Double totalPrice = item.getUnitprice() * item.getAmount();
 						item.setDeoid(order.getId());
-						item.setTotalprice(Double.valueOf(df.format(totalprice)));
+						item.setTotalprice(Double.valueOf(df.format(totalPrice)));
 						item.setDetno(item.getDetno());
 						item.setDetno(i);
 						items.add(item);
@@ -239,57 +241,78 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 				map.put("error", "订单保存失败");
 			}
 			// 记录关键字
-			DeputyOrderKeywords keyword = new DeputyOrderKeywords();
-			DeputyOrderKeywords oldkeyword = deputyOrderKeywordsDao
-					.findByEnuuAndTervendor(SystemSession.getUser().getEnterprise().getUu(), deorder.getTervendor());
-			if (oldkeyword != null) {// 更新
-				keyword = oldkeyword;
-			}
-			keyword.setTervendor(deorder.getTervendor());
-			keyword.setBankaccount(order.getBankaccount());
-			keyword.setBankaddress(order.getBankaddress());
-			keyword.setBankcode(order.getBankcode());
-			keyword.setBankname(order.getBankname());
-			keyword.setCompanyname(order.getCompanyname());
-			keyword.setDate(new Date());
-			keyword.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-			keyword.setLegalrepresent(order.getLegalrepresent());
-			keyword.setOtherdata(order.getOtherdata());
-			keyword.setTervendaddress(order.getTervendaddress());
-			keyword.setUseruu(SystemSession.getUser().getUserUU());
-			keyword.setVendtel(order.getVendtel());
-			keyword.setVenduser(order.getVenduser());
-			keyword.setEnfax(order.getEnfax());
-			keyword.setDeliverymethod(order.getDeliverymethod());
-			deputyOrderKeywordsDao.save(keyword);
+            saveKeywords(order);
 			// 记录供应商
-			DeputyHisVendors oldvendor = deputyHisVendorsDao
-					.findByEnuuAndVendorname(SystemSession.getUser().getEnterprise().getUu(), order.getTervendor());
-			if (null == oldvendor) {// 不存在才进行插入
-				DeputyHisVendors vendor = new DeputyHisVendors();
-				vendor.setDate(new Date());
-				vendor.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-				vendor.setUseruu(SystemSession.getUser().getUserUU());
-				vendor.setVendorname(order.getTervendor());
-				deputyHisVendorsDao.save(vendor);
-			}
+            saveVendors(order);
 			// 记录上次的关键词（不关联供应商）
-			DeputyLastOrderKeywords keywords = new DeputyLastOrderKeywords();
-			DeputyLastOrderKeywords lastkeywords = deputyLastOrderKeywordsDao
-					.findByEnuu(SystemSession.getUser().getEnterprise().getUu());
-			if (lastkeywords != null) {
-				keywords = lastkeywords;
-			}
-			keywords.setDate(new Date());
-			keywords.setEnuu(SystemSession.getUser().getEnterprise().getUu());
-			keywords.setMadealcode(order.getMadealcode());
-			keywords.setMadealdate(order.getMadealdate());
-			deputyLastOrderKeywordsDao.save(keywords);
+            saveLastKeywords(order);
 		}
 		return map;
 	}
 
-	@Override
+    /**
+     * 记录上次的关键词
+     *
+     * @param order 代采订单
+     */
+    private void saveLastKeywords(DeputyOrder order) {
+        DeputyLastOrderKeywords keywords = deputyLastOrderKeywordsDao
+                .findByEnuu(SystemSession.getUser().getEnterprise().getUu());
+        keywords.setDate(new Date(System.currentTimeMillis()));
+        keywords.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+        keywords.setMadealcode(order.getMadealcode());
+        keywords.setMadealdate(order.getMadealdate());
+        deputyLastOrderKeywordsDao.save(keywords);
+    }
+
+    /**
+     * 保存供应商
+     *
+     * @param order 代采订单
+     */
+    private void saveVendors(DeputyOrder order) {
+        DeputyHisVendors oldVendor = deputyHisVendorsDao
+                .findByEnuuAndVendorname(SystemSession.getUser().getEnterprise().getUu(), order.getTervendor());
+        // 不存在才进行插入
+        if (null == oldVendor) {
+            DeputyHisVendors vendor = new DeputyHisVendors();
+            vendor.setDate(new Date(System.currentTimeMillis()));
+            vendor.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+            vendor.setUseruu(SystemSession.getUser().getUserUU());
+            vendor.setVendorname(order.getTervendor());
+            deputyHisVendorsDao.save(vendor);
+        }
+    }
+
+    /**
+     * 保存关键字
+     *
+     * @param order 代采订单
+     */
+    private void saveKeywords(DeputyOrder order) {
+        DeputyOrderKeywords keyword = deputyOrderKeywordsDao
+                .findByEnuuAndTervendor(SystemSession.getUser().getEnterprise().getUu(), order.getTervendor());
+        // 更新
+        keyword.setTervendor(order.getTervendor());
+        keyword.setBankaccount(order.getBankaccount());
+        keyword.setBankaddress(order.getBankaddress());
+        keyword.setBankcode(order.getBankcode());
+        keyword.setBankname(order.getBankname());
+        keyword.setCompanyname(order.getCompanyname());
+        keyword.setDate(new Date(System.currentTimeMillis()));
+        keyword.setEnuu(SystemSession.getUser().getEnterprise().getUu());
+        keyword.setLegalrepresent(order.getLegalrepresent());
+        keyword.setOtherdata(order.getOtherdata());
+        keyword.setTervendaddress(order.getTervendaddress());
+        keyword.setUseruu(SystemSession.getUser().getUserUU());
+        keyword.setVendtel(order.getVendtel());
+        keyword.setVenduser(order.getVenduser());
+        keyword.setEnfax(order.getEnfax());
+        keyword.setDeliverymethod(order.getDeliverymethod());
+        deputyOrderKeywordsDao.save(keyword);
+    }
+
+    @Override
 	public DeputyOrder getOrderDetail(Long id) {
 		return deputyOrderDao.findOne(id);
 	}
@@ -322,7 +345,6 @@ public class DeputyOrderServiceImpl implements DeputyOrderService {
 		DeputyOrder order = deputyOrderDao.findOne(id);
 		if (order != null) {
 			order.setPrint((short) ((order.getPrint() == null ? 0 : order.getPrint()) + 1));
-//			PrintLog printLog = new PrintLog(new Date(), SystemSession.getUser().getUserName(), "平台客户打印代采订单", order.getId(), "purc$orders", order.getCode(), order.getErpId(), Constant.NO);
 		}
 		deputyOrderDao.save(order);
 	}