Merge branch 'hotfix-0917-yuj' into dev

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceServiceImpl.java

@@ -37,7 +37,6 @@ import com.uas.platform.b2c.trade.order.model.Order;
 import com.uas.platform.b2c.trade.order.model.OrderDetail;
 import com.uas.platform.b2c.trade.order.model.Purchase;
 import com.uas.platform.b2c.trade.order.model.PurchaseDetail;
-import com.uas.platform.b2c.trade.order.service.OrderService;
 import com.uas.platform.b2c.trade.support.CodeType;
 import com.uas.platform.b2c.trade.support.ResultMap;
 import com.uas.platform.core.exception.IllegalOperatorException;
@@ -70,26 +69,32 @@ import java.util.*;
 @Service
 public class InvoiceServiceImpl implements InvoiceService {
 
-    private final InvoiceDao invoiceDao;
-
-    private final InvoiceFPurchaseDao invoiceFPurchaseDao;
+    @Autowired
+    private InvoiceDao invoiceDao;
 
-    private final InvoiceFOrderDao invoiceFOrderDao;
+    @Autowired
+    private InvoiceFPurchaseDao invoiceFPurchaseDao;
 
-    private final OrderDao orderDao;
+    @Autowired
+    private InvoiceFOrderDao invoiceFOrderDao;
 
-    private final CreateNumberService createNumberService;
+    @Autowired
+    private OrderDao orderDao;
 
-    private final LogisticsPortService logisticsPortservice;
+    @Autowired
+    private CreateNumberService createNumberService;
 
     @Autowired
-    private OrderService orderService;
+    private LogisticsPortService logisticsPortservice;
 
-    private final SysConf sysConf;
+    @Autowired
+    private SysConf sysConf;
 
-    private final EnterpriseService enterpriseService;
+    @Autowired
+    private EnterpriseService enterpriseService;
 
-    private final InOutboundDetailService inOutboundDetailService;
+    @Autowired
+    private InOutboundDetailService inOutboundDetailService;
 
     @Autowired
     private CommodityInOutboundService commodityInOutboundService;
@@ -97,30 +102,18 @@ public class InvoiceServiceImpl implements InvoiceService {
     @Autowired
     private PurchaseDao purchaseDao;
 
-    private final EnterpriseDao enterpriseDao;
-
-    private final ProductService productService;
+    @Autowired
+    private EnterpriseDao enterpriseDao;
 
-    private final GoodsService goodsService;
+    @Autowired
+    private ProductService productService;
 
-    private final LogisticsOldService logisticsService;
+    @Autowired
+    private GoodsService goodsService;
 
     @Autowired
-    public InvoiceServiceImpl(InvoiceDao invoiceDao, InvoiceFPurchaseDao invoiceFPurchaseDao, InvoiceFOrderDao invoiceFOrderDao, OrderDao orderDao, CreateNumberService createNumberService, LogisticsPortService logisticsPortservice, SysConf sysConf, EnterpriseService enterpriseService, InOutboundDetailService inOutboundDetailService, EnterpriseDao enterpriseDao, ProductService productService, GoodsService goodsService, LogisticsOldService logisticsService) {
-        this.invoiceDao = invoiceDao;
-        this.invoiceFPurchaseDao = invoiceFPurchaseDao;
-        this.invoiceFOrderDao = invoiceFOrderDao;
-        this.orderDao = orderDao;
-        this.createNumberService = createNumberService;
-        this.logisticsPortservice = logisticsPortservice;
-        this.sysConf = sysConf;
-        this.enterpriseService = enterpriseService;
-        this.inOutboundDetailService = inOutboundDetailService;
-        this.enterpriseDao = enterpriseDao;
-        this.productService = productService;
-        this.goodsService = goodsService;
-        this.logisticsService = logisticsService;
-    }
+    private LogisticsOldService logisticsService;
+
 
     @Override
     public ResultMap convert() {

src/main/resources/txcloud/sys.properties

@@ -57,4 +57,7 @@ messageServiceUrl=http://api-message.ubtob.com/
 #b2b
 b2b=http://uas.ubtob.com
 b2bDomain=uas.ubtob.com
-b2bInner=http://10.10.100.103:8080
+b2bInner=http://10.10.100.103:8080
+
+#lottery
+lottery=http://192.168.253.3:26789/