Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
fe918478
Commit
fe918478
authored
Dec 11, 2024
by
Smile
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 放货收货人创建赋值不完整
parent
34cf5e93
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
+12
-2
CustomerApiImpl.java
...er/yudao/module/customer/service/api/CustomerApiImpl.java
+9
-1
CustomerMapper.xml
...ore/src/main/resources/mapper/customer/CustomerMapper.xml
+2
-0
OrderCargoControlPickServiceImpl.java
...derCargoControlPick/OrderCargoControlPickServiceImpl.java
+1
-1
No files found.
yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/service/api/CustomerApiImpl.java
View file @
fe918478
package
cn
.
iocoder
.
yudao
.
module
.
customer
.
service
.
api
;
import
cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO
;
import
cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils
;
import
cn.iocoder.yudao.module.customer.dal.dataobject.customer.CustomerDO
;
import
cn.iocoder.yudao.module.customer.dal.dataobject.customerContacts.CustomerContactsDO
;
import
cn.iocoder.yudao.module.customer.service.customer.CustomerService
;
...
...
@@ -95,11 +97,17 @@ public class CustomerApiImpl implements CustomerApi {
}
public
void
associateCargoCustomerAuto
(
String
areaCode
,
String
phone
,
String
newName
,
String
email
)
{
public
void
associateCargoCustomerAuto
(
Integer
transTypeId
,
String
areaCode
,
String
phone
,
String
newName
,
String
email
)
{
//先查询此用户是否有关联老客户
CustomerContactsDO
customerContactsDO
=
customerContactsService
.
getUniqueOneAndValidate
(
areaCode
,
phone
,
null
);
if
(
customerContactsDO
==
null
)
{
CustomerCreateReqVO
customerCreateReqVO
=
new
CustomerCreateReqVO
();
DictDataRespDTO
transPortTypeDictDataRespDTO
=
DictFrameworkUtils
.
getDictDataFromCache
(
"transport_type"
,
String
.
valueOf
(
transTypeId
));
DictDataRespDTO
customertTransPortTypeDictDataRespDTO
=
DictFrameworkUtils
.
parseDictDataFromCache
(
"customer_transport_type"
,
transPortTypeDictDataRespDTO
.
getLabel
());
String
value
=
customertTransPortTypeDictDataRespDTO
.
getValue
();
if
(
value
!=
null
){
customerCreateReqVO
.
setTransportType
(
value
);
}
//初始化名字为手机号
customerCreateReqVO
.
setName
(
newName
);
customerCreateReqVO
.
setNameEn
(
newName
);
...
...
yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerMapper.xml
View file @
fe918478
...
...
@@ -80,6 +80,8 @@
<result
column=
"vip_level_name_en"
jdbcType=
"VARCHAR"
property=
"vipLevelNameEn"
/>
<result
column=
"busi_country_name_zh"
jdbcType=
"VARCHAR"
property=
"busiCountryNameZh"
/>
<result
column=
"busi_country_name_en"
jdbcType=
"VARCHAR"
property=
"busiCountryNameEn"
/>
<result
column=
"country_name_zh"
jdbcType=
"VARCHAR"
property=
"countryNameZh"
/>
<result
column=
"country_name_en"
jdbcType=
"VARCHAR"
property=
"countryNameEn"
/>
<result
column=
"competitor_names"
jdbcType=
"VARCHAR"
property=
"competitorNames"
/>
<result
column=
"creator_name"
jdbcType=
"VARCHAR"
property=
"creatorName"
/>
<result
column=
"updater_name"
jdbcType=
"VARCHAR"
property=
"updaterName"
/>
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControlPick/OrderCargoControlPickServiceImpl.java
View file @
fe918478
...
...
@@ -342,7 +342,7 @@ public class OrderCargoControlPickServiceImpl extends AbstractService<OrderCargo
orderBusinessService
.
createOrderControlLog
(
orderCargoControlPick
.
getOrderId
(),
4
,
"订单放货"
,
msg
,
0L
);
orderBusinessService
.
addOrderOperateLog
(
orderCargoControlPick
.
getOrderId
(),
"订单放货"
,
msg
,
""
);
//控货收货人自动创建客户
customerApiImpl
.
associateCargoCustomerAuto
(
orderCargoControlPick
.
getConsigneeCountryCode
(),
orderCargoControlPick
.
getConsigneePhone
(),
orderCargoControlPick
.
getConsigneeName
(),
orderCargoControlPick
.
getConsigneeEmail
());
customerApiImpl
.
associateCargoCustomerAuto
(
order
DO
.
getTransportId
(),
order
CargoControlPick
.
getConsigneeCountryCode
(),
orderCargoControlPick
.
getConsigneePhone
(),
orderCargoControlPick
.
getConsigneeName
(),
orderCargoControlPick
.
getConsigneeEmail
());
// 返回
return
orderCargoControlPick
.
getId
();
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment