This commit is contained in:
parent
251f48667d
commit
17d4ec5428
|
|
@ -255,7 +255,7 @@ public class OrderController {
|
||||||
modelMap.put("count", listOrderExcution.getCount());
|
modelMap.put("count", listOrderExcution.getCount());
|
||||||
return new Result(true, modelMap);
|
return new Result(true, modelMap);
|
||||||
} else {
|
} else {
|
||||||
return new Result<>(true, listOrderExcution.getState(), listOrderExcution.getStateInfo());
|
return new Result<>(false, listOrderExcution.getState(), listOrderExcution.getStateInfo());
|
||||||
}
|
}
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
logger.error(e.getMessage());
|
logger.error(e.getMessage());
|
||||||
|
|
|
||||||
|
|
@ -412,7 +412,7 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="queryChargeStart" resultType="Integer" parameterType="Integer">
|
<select id="queryChargeStart" resultType="Integer" parameterType="Integer">
|
||||||
SELECT status FROM m_order WHERE id = #{orderModifyState.id} AND account_id = #{orderModifyState.courierId}
|
SELECT status FROM m_order WHERE id = #{orderModifyState.id} AND account_id = #{orderModifyState.accountId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<update id="editCourierPicks">
|
<update id="editCourierPicks">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue