Commit fe918478 authored by Smile's avatar Smile

fix: 放货收货人创建赋值不完整

parent 34cf5e93
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);
......
......@@ -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"/>
......
......@@ -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(orderDO.getTransportId(),orderCargoControlPick.getConsigneeCountryCode(), orderCargoControlPick.getConsigneePhone(), orderCargoControlPick.getConsigneeName(), orderCargoControlPick.getConsigneeEmail());
// 返回
return orderCargoControlPick.getId();
}
......
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