|
|
@@ -124,11 +124,11 @@ public class CallBackController {
|
|
|
tbIndentService.riderBuyGoods(tbIndent);
|
|
|
} else if ("6".equals(state)) {//完成订单
|
|
|
log.info("骑手完成订单:" + order_no);
|
|
|
- if (tbOrder.getStatus()!=3) {
|
|
|
+ if (tbOrder.getStatus()!=4) {
|
|
|
tbOrder.setStatus(3);
|
|
|
appOrderService.updateOrder(tbOrder);
|
|
|
}
|
|
|
- if (!"4".equals(tbIndent.getIndentState())) {
|
|
|
+ if (!"6".equals(tbIndent.getIndentState())) {
|
|
|
tbIndent.setIndentState("4"); // 4:骑手已取货/购买
|
|
|
String receiveTimeStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
|
|
|
tbIndent.setRiderUserId(userEntity.getUserId());
|