From b701afcbfde2472179582ab277c379f71646f625 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Wed, 16 Sep 2020 09:05:48 +0800 Subject: [PATCH] . --- .../order/ordersale/OrderSaleSyncService.java | 32 +++++------ .../order/ordertemp/OrderTempSyncService.java | 57 ++++++++++--------- .../src/main/resources/prod/db.properties | 8 +-- 3 files changed, 51 insertions(+), 46 deletions(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java index 9aed494..56535c6 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordersale/OrderSaleSyncService.java @@ -130,14 +130,14 @@ public class OrderSaleSyncService { order.setOrderclusterId(ordercluster_id); // 客户信息 - order.setCustomerId(ordercluster.getCustomerId()); - order.setCustomerAddress(ordercluster.getCustomerAddress()); - order.setCustomerBankAccount(ordercluster.getCustomerBankAccount()); - order.setCustomerBankName(ordercluster.getCustomerBankName()); - order.setCustomerName(ordercluster.getCustomerName()); - order.setCustomerPhone(ordercluster.getCustomerPhone()); - order.setCustomerTexpayerName(ordercluster.getCustomerTexpayerName()); - order.setCustomerTexpayerNum(ordercluster.getCustomerTexpayerNum()); + order.setCustomerId(customer.getId()); + order.setCustomerAddress(customer.getAddress()); + order.setCustomerBankAccount(customer.getBankAccount()); + order.setCustomerBankName(customer.getBankName()); + order.setCustomerName(customer.getName()); + order.setCustomerPhone(customer.getPhone()); + order.setCustomerTexpayerName(customer.getTexpayerName()); + order.setCustomerTexpayerNum(customer.getTexpayerNum()); // 客户收货信息 order.setCustomerReceiverName(ordercluster.getCustomerReceiverName()); @@ -347,14 +347,14 @@ public class OrderSaleSyncService { order.setOrderclusterId(ordercluster_id); // 客户信息 - order.setCustomerId(ordercluster.getCustomerId()); - order.setCustomerAddress(ordercluster.getCustomerAddress()); - order.setCustomerBankAccount(ordercluster.getCustomerBankAccount()); - order.setCustomerBankName(ordercluster.getCustomerBankName()); - order.setCustomerName(ordercluster.getCustomerName()); - order.setCustomerPhone(ordercluster.getCustomerPhone()); - order.setCustomerTexpayerName(ordercluster.getCustomerTexpayerName()); - order.setCustomerTexpayerNum(ordercluster.getCustomerTexpayerNum()); + order.setCustomerId(customer.getId()); + order.setCustomerAddress(customer.getAddress()); + order.setCustomerBankAccount(customer.getBankAccount()); + order.setCustomerBankName(customer.getBankName()); + order.setCustomerName(customer.getName()); + order.setCustomerPhone(customer.getPhone()); + order.setCustomerTexpayerName(customer.getTexpayerName()); + order.setCustomerTexpayerNum(customer.getTexpayerNum()); // 客户收货信息 order.setCustomerReceiverName(ordercluster.getCustomerReceiverName()); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index b34805a..53b2798 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -52,7 +52,7 @@ public class OrderTempSyncService { return Result.failed("进出场记录已完结或者已作废，不能使用"); } - InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); + InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); if (receive == null) { return Result.failed("没有有效的发票领用记录"); } @@ -74,10 +74,10 @@ public class OrderTempSyncService { return Result.failedstr("未查到有效的单价信息"); } - BigDecimal min = new BigDecimal(0.001); - Date now = new Date(); - SyncTask synctask = new SyncTask(); - OrderTemp order = new OrderTemp(); + BigDecimal min = new BigDecimal(0.001); + Date now = new Date(); + SyncTask synctask = new SyncTask(); + OrderTemp order = new OrderTemp(); order.setUuid(uuid); @@ -138,7 +138,7 @@ public class OrderTempSyncService { transport.setState(order.getState()); // 使用 order 的 state transport.setType(OrderTypeEnum.TEMP.getTypeid()); - String finalNext_invoice_code = next_invoice_code; + String finalNext_invoice_code = next_invoice_code; boolean ret = Db.tx(new IAtom() { @Override public boolean run() { @@ -236,7 +236,7 @@ public class OrderTempSyncService { return Result.failed("进出场记录已完结或者已作废，不能使用"); } - InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); + InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); if (receive == null) { return Result.failed("没有有效的发票领用记录"); } @@ -251,6 +251,11 @@ public class OrderTempSyncService { return Result.failedstr("集团订单【%s】信息不存在", ordercluster_id); } + Customer customer = Customer.dao.findById(ordercluster.getCustomerId()); + if (customer == null) { + return Result.failed("未找到关联客户信息"); + } + if (!DateTimeUtil.isToday(ordercluster.getCutoffTime())) { return Result.failedstr("集团订单只能在%s使用", DateTimeUtil.sdfymd.get().format(ordercluster.getCutoffTime())); } @@ -276,10 +281,10 @@ public class OrderTempSyncService { return Result.failedstr("【%s】不是今日分配车辆", transport.getTruckLicense()); } - BigDecimal min = new BigDecimal(0.001); - Date now = new Date(); - SyncTask synctask = new SyncTask(); - OrderTemp order = new OrderTemp(); + BigDecimal min = new BigDecimal(0.001); + Date now = new Date(); + SyncTask synctask = new SyncTask(); + OrderTemp order = new OrderTemp(); order.setUuid(uuid); @@ -329,14 +334,14 @@ public class OrderTempSyncService { order.setOrderclusterId(ordercluster_id); // 客户信息 - order.setCustomerId(ordercluster.getCustomerId()); - order.setCustomerAddress(ordercluster.getCustomerAddress()); - order.setCustomerBankAccount(ordercluster.getCustomerBankAccount()); - order.setCustomerBankName(ordercluster.getCustomerBankName()); - order.setCustomerName(ordercluster.getCustomerName()); - order.setCustomerPhone(ordercluster.getCustomerPhone()); - order.setCustomerTexpayerName(ordercluster.getCustomerTexpayerName()); - order.setCustomerTexpayerNum(ordercluster.getCustomerTexpayerNum()); + order.setCustomerId(customer.getId()); + order.setCustomerAddress(customer.getAddress()); + order.setCustomerBankAccount(customer.getBankAccount()); + order.setCustomerBankName(customer.getBankName()); + order.setCustomerName(customer.getName()); + order.setCustomerPhone(customer.getPhone()); + order.setCustomerTexpayerName(customer.getTexpayerName()); + order.setCustomerTexpayerNum(customer.getTexpayerNum()); // 物流公司信息 order.setTransCoId(ordercluster.getTransCoId()); @@ -485,7 +490,7 @@ public class OrderTempSyncService { return Result.failed("进出场记录已完结或者已作废，不能使用"); } - InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); + InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(transport.getSupermarketId()); if (receive == null) { return Result.failed("没有有效的发票领用记录"); } @@ -588,8 +593,8 @@ public class OrderTempSyncService { return Result.failed("客户余额不足"); } - Date now = new Date(); - SyncTask synctask = new SyncTask(); + Date now = new Date(); + SyncTask synctask = new SyncTask(); // if (req_receipt == 1) { // 需要同时开具发票 order.setInvoiceCode(next_invoice_code); @@ -903,7 +908,7 @@ public class OrderTempSyncService { return Result.failed("订单已经取消"); } - InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(order.getSupermarketId()); + InvoiceReceive receive = InvoiceReceiveService.me.foremostReceive(order.getSupermarketId()); if (receive == null) { return Result.failed("没有有效的发票领用记录"); } @@ -926,7 +931,7 @@ public class OrderTempSyncService { boolean ret = Db.tx(new IAtom() { @Override public boolean run() { - try{ + try { boolean ret = order.update(); if (!ret) { @@ -968,14 +973,14 @@ public class OrderTempSyncService { return ret && SyncTaskService.me.save(synctask) && ModifyLogService.me.save(order.tablename, "sn", logrecord.toJson(), Enums.DataOpType.UPDATE.getId(), sysuser); - }catch (Exception e){ + } catch (Exception e) { log.error(e.getMessage(), e); return false; } } }); - if(ret){ + if (ret) { Transport transport = Transport.dao.findById(order.get("transport_id")); if (transport == null) { diff --git a/ssjygl-xsx-service/src/main/resources/prod/db.properties b/ssjygl-xsx-service/src/main/resources/prod/db.properties index 28096c4..7b2518b 100644 --- a/ssjygl-xsx-service/src/main/resources/prod/db.properties +++ b/ssjygl-xsx-service/src/main/resources/prod/db.properties @@ -1,11 +1,11 @@ # mysql -jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_service_dev?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true +jdbcUrl=jdbc:mysql://rm-wz9wa070076b2uge2ro.mysql.rds.aliyuncs.com:3306/ssjy_xsx_service?characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull&useInformationSchema=true&serverTimezone=GMT%2B8&autoReconnect=true user=ssjy_xsx password=Ssjy_xs_890 # redis redis.basekey=ssjcgl_xsx -redis.ip=192.168.0.219 +redis.ip=r-wz9168ab2f2f7ec4pd.redis.rds.aliyuncs.com redis.port=6379 -redis.pwd= -redis.db= \ No newline at end of file +redis.pwd=CoWR1111 +redis.db=13 \ No newline at end of file