xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

dev
lisai17@sina.com 2020-10-12 17:22:54 +08:00
parent 65f18b634f
commit 368c0dce7f
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
View File

@ -99,10 +99,10 @@ public class OrderTempSyncService {
BigDecimal net_weight = transport.getSecondWeight().subtract(transport.getFirstWeight()); // 销售的用第二次减第一次 BigDecimal net_weight = transport.getSecondWeight().subtract(transport.getFirstWeight()); // 销售的用第二次减第一次
// if (req_receipt == 1) { // 需要同时开具发票 if (req_receipt == 1) { // 需要同时开具发票
order.setInvoiceCode(invoice_code); order.setInvoiceCode(invoice_code);
order.setInvoiceNumber(invoice_number); order.setInvoiceNumber(invoice_number);
// } }
order.setTransportId(transport.getId()); order.setTransportId(transport.getId());
order.setSupermarketId(transport.getSupermarketId()); order.setSupermarketId(transport.getSupermarketId());
@ -791,12 +791,12 @@ public class OrderTempSyncService {
} }
/** /**
* @deprecated
* @param sn * @param sn
* @param invalid_memo * @param invalid_memo
* @param sysuser * @param sysuser
* @param password * @param password
* @return * @return
* @deprecated
*/ */
public Result cancel(String sn, String invalid_memo, Sysuser sysuser, String password) { public Result cancel(String sn, String invalid_memo, Sysuser sysuser, String password) {
// TODO: 判断权限 // TODO: 判断权限

2
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/AuthInterceptor.java
View File

@ -33,6 +33,8 @@ public class AuthInterceptor implements Interceptor {
add("/stat/sale/statDayCustomer"); add("/stat/sale/statDayCustomer");
add("/stat/sale/daydetail"); add("/stat/sale/daydetail");
add("/stat/sale/statMonthCustomer");
add("/stat/sale/statRangeCustomer");
add("/prepay/find"); add("/prepay/find");
add("/prepay/consumption"); add("/prepay/consumption");

12
ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/order/ordercluster/OrderclusterSyncService.java
View File

@ -177,10 +177,10 @@ public class OrderclusterSyncService extends BaseSyncService {
public boolean run() { public boolean run() {
try { try {
// 单个对象调用 save 可以获取返回的自增id // 单个对象调用 save 可以获取返回的自增id
for(Ordercluster model : newlist){ for (Ordercluster model : newlist) {
boolean ret = model.save(); boolean ret = model.save();
if(!ret){ if (!ret) {
return false; return false;
} }
@ -308,10 +308,10 @@ public class OrderclusterSyncService extends BaseSyncService {
model.setCustomerTexpayerName(customer_name); model.setCustomerTexpayerName(customer_name);
// 判断是否需要开具发票 // 判断是否需要开具发票
// if (req_receipt == 1) { if (req_receipt == 1) {
model.setCustomerTexpayerName(customer_texpayer_name); model.setCustomerTexpayerName(customer_texpayer_name);
model.setCustomerTexpayerNum(customer_texpayer_num); model.setCustomerTexpayerNum(customer_texpayer_num);
// } }
model.setTransDistance(new BigDecimal(0)); model.setTransDistance(new BigDecimal(0));