Commit a1acceeb by 蒋小洋

Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of…

Merge branches 'ka-查询野翠山订单列表是否可开发票-2021-09-15-蒋小洋' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
parents f713d489 948758bd
......@@ -1325,7 +1325,7 @@ public class OrderAdapter {
//取餐码用日订单序号代替- v1.5.4变更为四位随机数
responseVo.setTakeCode(ordersBean.getOtherCode());
responseVo.setAmount(ordersBean.getAmount());
responseVo.setActualPayAmount(orderBean.getActualPayAmount());
responseVo.setActualPayAmount(ordersBean.getActualPayAmount());
OrderViewStatusDto orderViewStatusDto = getOrderViewStatusDesc(ordersBean, wxAppId);
//围餐需求 订单中存在未称重的商品称重商品则金额为0
if (IappIdType.WC_XCX.getCode().equals(iAppId)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment