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:37:26 +08:00
parent 73bf273bcd
commit ab9d82ffbc
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,6 +195,8 @@ public class Oms2cWaybillController extends BaseController
// bug:1361 EMIS - 运单号的寄件手机号与小程序的手机号一致全部给小程序对应的手机号
// 获取当前登录人的手机号,如果电话一致就把订单归属给他
emisWaybill.getParams().put("queryPhone",getLoginUser().getUser().getPhone());
emisWaybill.getParams().put("myCustomerType",getLoginUser().getUser().getCustomerType());
emisWaybill.getParams().put("myCustNo",getLoginUser().getUser().getMonthlyPayCode());
List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill);
return getDataTable(list);

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

@ -418,7 +418,7 @@
<if test="sendPostcode != null and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
<if test="paymentType != null and paymentType != ''"> and payment_type=#{paymentType}</if>
<if test="calcFeeType != null and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
<if test="custNo != null and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
<if test="custNo != null and custNo != ''"> and cust_no=#{custNo}</if>
<if test="custName != null and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
<if test="transLineType != null and transLineType != ''"> and trans_line_type=#{transLineType}</if>
<if test="productType != null and productType != ''"> and product_type=#{productType}</if>
@ -540,13 +540,18 @@
<!-- 寄件 -->
<!-- 寄件 客户自己开单,发件号码是自己的,月结账号是自己的都要显示出来 -->
<if test="params.omsOrderTab == null or (params.omsOrderTab != null and params.omsOrderTab != 2) ">
and (
a.customer_code=#{customerCode}
<if test="params.myCustomerType==2 and params.myCustNo != null and params.myCustNo != '' ">
or a.cust_no=#{params.myCustNo}
</if>
<if test="params.queryPhone != null and params.queryPhone != '' ">
or a.send_mobile=#{params.queryPhone}
</if>
)
</if>