Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service/blade-client/src/main/java/org/springblade/client/serial/service/impl/TableMessageServiceImpl.java

@@ -82,14 +82,8 @@ public class TableMessageServiceImpl extends ServiceImpl<TableMessageMapper, Tab
 			} catch (Exception e) {
 				return R.data(500, "上传json文件失败");
 			}
+			file.delete();//上传文件成功删除本地文件
 
-			//R<BladeFile> bladeFileR = ossEndpointClient.putFile(multipartFile);
-			/*if (bladeFile != null){
-				tableMessage.setFileUrl(bladeFile.getLink());
-				file.delete();
-			}else {
-				return R.data(500,"上传json文件失败");
-			}*/
 		}
 		//保存用户自定义信息
 		Integer i;

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -91,12 +91,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//保存订单主表信息
 		if (order.getId() == null){
 			//获取系统编号
-			/*R billNo = serialClient.getBillNo(order.getBillType());
+			R billNo = serialClient.getBillNo(order.getBillType());
 			if (billNo.getCode() != 200){
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				return R.fail(500,"生成系统编号失败");
 			}
-			order.setSysNo((String) billNo.getData());*/
+			order.setSysNo((String) billNo.getData());
 			order.setTenantId(SecureUtil.getTenantId());
 			order.setCreateTime(date);
 			order.setCreateUser(SecureUtil.getUserId());