|
|
@@ -663,7 +663,7 @@ public class PurchaseServiceImpl implements PurchaseService {
|
|
|
}
|
|
|
}
|
|
|
// 修改明细的状态,设置为等待卖家同意
|
|
|
- if ((orderDetail.getStatus().intValue() == Status.PAID.value()) || (orderDetail.getStatus().intValue() == Status.TOBEPAID.value())) {
|
|
|
+ if ((orderDetail.getStatus().intValue() == Status.PAID.value()) || (orderDetail.getStatus().intValue() == Status.TOBEPAID.value()) || (orderDetail.getStatus() == com.uas.platform.b2c.core.constant.Status.TOBEPAIDAGAGIN.value())) {
|
|
|
if (isReceived) {
|
|
|
orderDetail.setStatusMonecyReceviced(userUU);
|
|
|
} else {
|
|
|
@@ -687,7 +687,7 @@ public class PurchaseServiceImpl implements PurchaseService {
|
|
|
Order newOrder = orderDao.save(order);
|
|
|
|
|
|
ArrayList<Integer> statusList = new ArrayList<>();
|
|
|
- Collections.addAll(statusList, Status.TOBECONFIRMED.value(), Status.PAID.value());
|
|
|
+ Collections.addAll(statusList, Status.TOBECONFIRMED.value(), Status.PAID.value(), com.uas.platform.b2c.core.constant.Status.TOBEPAIDAGAGIN.value());
|
|
|
|
|
|
if (statusList.contains(purchase.getStatus())) {
|
|
|
if (isReceived) {
|