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 184a8f5..a9df062 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 @@ -99,10 +99,10 @@ public class OrderTempSyncService { BigDecimal net_weight = transport.getSecondWeight().subtract(transport.getFirstWeight()); // 销售的用第二次减第一次 -// if (req_receipt == 1) { // 需要同时开具发票 - order.setInvoiceCode(invoice_code); - order.setInvoiceNumber(invoice_number); -// } + if (req_receipt == 1) { // 需要同时开具发票 + order.setInvoiceCode(invoice_code); + order.setInvoiceNumber(invoice_number); + } order.setTransportId(transport.getId()); order.setSupermarketId(transport.getSupermarketId()); @@ -791,12 +791,12 @@ public class OrderTempSyncService { } /** - * @deprecated * @param sn * @param invalid_memo * @param sysuser * @param password * @return + * @deprecated */ public Result cancel(String sn, String invalid_memo, Sysuser sysuser, String password) { // TODO: 判断权限 diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java index aa2d9ce..8df3c29 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java @@ -33,6 +33,8 @@ public class AuthInterceptor implements Interceptor { add("/stat/sale/statDayCustomer"); add("/stat/sale/daydetail"); + add("/stat/sale/statMonthCustomer"); + add("/stat/sale/statRangeCustomer"); add("/prepay/find"); add("/prepay/consumption"); diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java index 3a0424b..6fb25af 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java @@ -177,10 +177,10 @@ public class OrderclusterSyncService extends BaseSyncService { public boolean run() { try { // 单个对象调用 save 可以获取返回的自增id - for(Ordercluster model : newlist){ + for (Ordercluster model : newlist) { boolean ret = model.save(); - if(!ret){ + if (!ret) { return false; } @@ -308,10 +308,10 @@ public class OrderclusterSyncService extends BaseSyncService { model.setCustomerTexpayerName(customer_name); // 判断是否需要开具发票 -// if (req_receipt == 1) { - model.setCustomerTexpayerName(customer_texpayer_name); - model.setCustomerTexpayerNum(customer_texpayer_num); -// } + if (req_receipt == 1) { + model.setCustomerTexpayerName(customer_texpayer_name); + model.setCustomerTexpayerNum(customer_texpayer_num); + } model.setTransDistance(new BigDecimal(0));