diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 9f360fe..491cdc1 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -172,7 +172,11 @@ public class CustomerService { insertCustomer.setWechatUniId(turnBackDTOS.getWx_data().getUnit_id()); insertCustomer.setName(turnBackDTOS.getName()); insertCustomer.setAvatarUrl(turnBackDTOS.getWx_data().getAvatar_url()); + insertCustomer.setPhone(turnBackDTOS.getPhone()); if(null != opCustomer){ + //更新一下 + insertCustomer.setId(opCustomer.getId()); + opCustomerDOMapper.updateById(insertCustomer); //存在--1.处理客户导购关系。 sellerCustomerRelation(opCustomer,turnBackDTOS.getEa_code(),poiStore.getId(),poiStoreStaff.getUserId()); }else { @@ -211,22 +215,24 @@ public class CustomerService { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("phone",vipDataDTO.getPhone()).eq("name",vipDataDTO.getName()); OpVip opVip = opVipDOMapper.selectOne(wrapper); + OpVip opVip1 = new OpVip(); + opVip1.setStatus(1L); + opVip1.setPhone(vipDataDTO.getPhone()); + opVip1.setName(vipDataDTO.getName()); + opVip1.setBirthday(vipDataDTO.getBirthday()); + opVip1.setRegisterTime(new Date(vipDataDTO.getRegister_time())); if(opVip == null){ //数据库没有这个数据--新建数据 - OpVip opVip1 = new OpVip(); - opVip1.setStatus(1L); - opVip1.setPhone(vipDataDTO.getPhone()); - opVip1.setName(vipDataDTO.getName()); - opVip1.setBirthday(vipDataDTO.getBirthday()); - opVip1.setRegisterTime(new Date(vipDataDTO.getRegister_time())); opVip1.setCreateTime(new Date()); - opVip1.setUpdateTime(new Date()); opVip1.setCreateBy(Constants.SYS_OPERATION); - opVip1.setUpdateBy(Constants.SYS_OPERATION); opVipDOMapper.insert(opVip1); //有vip信息就绑定信息 opCustomer.setMemberId(opVip1.getId()); }else { + opVip1.setId(opVip.getId()); + opVip1.setUpdateTime(new Date()); + opVip1.setUpdateBy(Constants.SYS_OPERATION); + opVipDOMapper.updateById(opVip1); //有vip信息就绑定信息 opCustomer.setMemberId(opVip.getId()); } @@ -246,22 +252,24 @@ public class CustomerService { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("phone",turnBackDTO.getVip_data().getPhone()).eq("name",turnBackDTO.getVip_data().getName()); OpVip opVip = opVipDOMapper.selectOne(wrapper); + OpVip opVip1 = new OpVip(); + opVip1.setStatus(1L); + opVip1.setPhone(turnBackDTO.getVip_data().getPhone()); + opVip1.setName(turnBackDTO.getVip_data().getName()); + opVip1.setBirthday(turnBackDTO.getVip_data().getBirthday()); + opVip1.setRegisterTime(new Date(turnBackDTO.getVip_data().getRegister_time())); if(opVip == null){ //数据库没有这个数据--新建数据 - OpVip opVip1 = new OpVip(); - opVip1.setStatus(1L); - opVip1.setPhone(turnBackDTO.getVip_data().getPhone()); - opVip1.setName(turnBackDTO.getVip_data().getName()); - opVip1.setBirthday(turnBackDTO.getVip_data().getBirthday()); - opVip1.setRegisterTime(new Date(turnBackDTO.getVip_data().getRegister_time())); - opVip1.setCreateTime(new Date()); - opVip1.setUpdateTime(new Date()); opVip1.setCreateBy(Constants.SYS_OPERATION); - opVip1.setUpdateBy(Constants.SYS_OPERATION); + opVip1.setCreateTime(new Date()); opVipDOMapper.insert(opVip1); //有vip信息就绑定信息 opCustomer.setMemberId(opVip1.getId()); }else { + opVip1.setId(opVip.getId()); + opVip1.setUpdateTime(new Date()); + opVip1.setUpdateBy(Constants.SYS_OPERATION); + opVipDOMapper.updateById(opVip1); //有vip信息就绑定信息 opCustomer.setMemberId(opVip.getId()); } diff --git a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java index 9231069..f707c01 100644 --- a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java +++ b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java @@ -1,5 +1,7 @@ package com.kiisoo.ic.synchronous.controller; +import com.alibaba.fastjson.JSON; +import com.google.gson.JsonObject; import com.kiisoo.ic.customer.CustomerService; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.synchronous.entity.TurnBackDTO; @@ -64,10 +66,12 @@ public class SynchronousController { * 好友添加回调通知 * @return 是否成功 */ - @RequestMapping(value = "/ics/customer",method = RequestMethod.POST) + @RequestMapping(value = "/ics/customer",method = RequestMethod.POST,consumes = "Application/json") @ResponseBody - public String turnBack(@RequestBody TurnBackDTO turnBackDTOS){ - customerService.turnBack(turnBackDTOS); + public String turnBack(@RequestBody List turnBackDTOS){ + String str = JSON.toJSONString(turnBackDTOS); + System.out.println(str); + turnBackDTOS.forEach(customerService::turnBack); return DataImportUtil.succ(1); } } diff --git a/src/main/java/com/kiisoo/ic/synchronous/entity/TurnBackDTO.java b/src/main/java/com/kiisoo/ic/synchronous/entity/TurnBackDTO.java index d3cee0a..dc9fb7e 100644 --- a/src/main/java/com/kiisoo/ic/synchronous/entity/TurnBackDTO.java +++ b/src/main/java/com/kiisoo/ic/synchronous/entity/TurnBackDTO.java @@ -1,5 +1,7 @@ package com.kiisoo.ic.synchronous.entity; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; /** @@ -39,7 +41,7 @@ public class TurnBackDTO { /** * 加入时间 */ - private Date join_time; + private String join_time; /** * 微信id对象 @@ -91,11 +93,11 @@ public class TurnBackDTO { this.phone = phone; } - public Date getJoin_time() { + public String getJoin_time() { return join_time; } - public void setJoin_time(Date join_time) { + public void setJoin_time(String join_time) { this.join_time = join_time; } @@ -114,4 +116,8 @@ public class TurnBackDTO { public void setVip_data(VipDataDTO vip_data) { this.vip_data = vip_data; } +// +// public Date getJoinTime() { +// return LocalDate.parse(this.join_time); +// } }