|
|
@@ -157,7 +157,7 @@ public class BillSubmitServiceImpl implements BillSubmitService {
|
|
|
purchase.setVatBillStatus(Status.TOBEMAKE_BILL.value());
|
|
|
purchaseDao.save(purchase);
|
|
|
}
|
|
|
- purchaseIds += ("+" + purchase.getPurchaseid());
|
|
|
+ purchaseIds += ("," + purchase.getPurchaseid());
|
|
|
}
|
|
|
orderIds += order.getOrderid();
|
|
|
if (i < orders.size() - 1)
|
|
|
@@ -172,7 +172,12 @@ public class BillSubmitServiceImpl implements BillSubmitService {
|
|
|
billSubmit.setStoreid(orders.get(0).getStoreid());
|
|
|
billSubmit.setPrice(price);
|
|
|
billSubmit.setOrderids(orderIds);
|
|
|
- billSubmit.setPurchaseids(purchaseIds);
|
|
|
+ if (StringUtils.isEmpty(purchaseIds)){
|
|
|
+ billSubmit.setPurchaseids(purchaseIds);
|
|
|
+ } else {
|
|
|
+ billSubmit.setPurchaseids(purchaseIds.substring(1));
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
return billSubmit;
|
|
|
}
|
|
|
@@ -232,8 +237,17 @@ public class BillSubmitServiceImpl implements BillSubmitService {
|
|
|
billSubmit.setSellerenuu(purchases.get(0).getSellerenuu());
|
|
|
billSubmit.setStoreid(purchases.get(0).getStoreid());
|
|
|
billSubmit.setPrice(price);
|
|
|
- billSubmit.setOrderids(orderIds.substring(1));
|
|
|
- billSubmit.setPurchaseids(purchaseIds.substring(1));
|
|
|
+ if (StringUtils.isEmpty(orderIds)) {
|
|
|
+ billSubmit.setOrderids(orderIds);
|
|
|
+ } else {
|
|
|
+ billSubmit.setOrderids(orderIds.substring(1));
|
|
|
+ }
|
|
|
+ if (StringUtils.isEmpty(purchaseIds)) {
|
|
|
+ billSubmit.setPurchaseids(purchaseIds);
|
|
|
+ } else {
|
|
|
+ billSubmit.setPurchaseids(purchaseIds.substring(1));
|
|
|
+ }
|
|
|
+
|
|
|
list.add(billSubmit);
|
|
|
|
|
|
}
|