aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-15 17:09:14 +08:00
parent da4c8bdcd8
commit ee41cdb454
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
View File

@ -234,6 +234,12 @@ public class Oms2cWaybillController extends BaseController
emisWaybill.getParams().put("isSapp","1"); emisWaybill.getParams().put("isSapp","1");
// 用户只能获取自己的单子 // 用户只能获取自己的单子
emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode()); emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode());
// bug:1361 EMIS - 运单号的寄件手机号与小程序的手机号一致全部给小程序对应的手机号
// 获取当前登录人的手机号,如果电话一致就把订单归属给他
emisWaybill.getParams().put("queryPhone",getLoginUser().getUser().getPhone());
List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }

19
emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -373,11 +373,11 @@
<if test="params.isSapp !=null and params.isSapp == 1"> <if test="params.isSapp !=null and params.isSapp == 1">
<if test="billCode != null and billCode != ''"> <if test="billCode != null and billCode != ''">
and ( and (
bill_code like concat('%', #{billCode}, '%') a.bill_code like concat('%', #{billCode}, '%')
or send_name like concat('%', #{billCode}, '%') or a.send_name like concat('%', #{billCode}, '%')
or receive_name like concat('%', #{billCode}, '%') or a.receive_name like concat('%', #{billCode}, '%')
or receive_mobile like concat('%', #{billCode}, '%') or a.receive_mobile like concat('%', #{billCode}, '%')
or send_mobile like concat('%', #{billCode}, '%') or a.send_mobile like concat('%', #{billCode}, '%')
) )
</if> </if>
</if> </if>
@ -542,12 +542,17 @@
<!-- 寄件 --> <!-- 寄件 -->
<if test="params.omsOrderTab == null or (params.omsOrderTab != null and params.omsOrderTab != 2) "> <if test="params.omsOrderTab == null or (params.omsOrderTab != null and params.omsOrderTab != 2) ">
and a.customer_code=#{customerCode} and (
a.customer_code=#{customerCode}
<if test="params.queryPhone != null and params.queryPhone != '' ">
or a.send_mobile=#{params.queryPhone}
</if>
)
</if> </if>
<!-- 收件 --> <!-- 收件 -->
<if test="params.omsOrderTab != null and params.omsOrderTab == 2 "> <if test="params.omsOrderTab != null and params.omsOrderTab == 2 ">
and exists (select 1 from emis_customer_user ecu where a.del_flag='0' and a.receive_mobile=ecu.phone and ecu.customer_code=#{customerCode} ) a.receive_mobile=#{params.queryPhone}
</if> </if>
<!-- 待付款 --> <!-- 待付款 -->