diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 6dbf343..4c434ce 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -38,6 +38,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -161,7 +162,6 @@ public class CustomerService { * @param turnBackDTOS 数据实体 * @return 是否成功 */ - @Transactional(rollbackFor = Exception.class) public void turnBack(TurnBackDTO turnBackDTOS) throws Exception { if (turnBackDTOS.getWxData().getUnionId() == null || turnBackDTOS.getUserId() == null) { return; @@ -189,6 +189,13 @@ public class CustomerService { } //做插入使用 --如果没有客户信息就先创建客户信息如果有就判断是否有客户导购得关系,如果没有就添加有就不管 + vipDataUpdate(turnBackDTOS, shop, opCustomer, poiStoreStaff, poiStore); + //todo 发送websocket放开 +// WebSocketController.sendInfo(new Gson().toJson(insertCustomer)); + } + + @Transactional(rollbackFor = Exception.class) + public void vipDataUpdate(TurnBackDTO turnBackDTOS, PoiStore shop, OpCustomer opCustomer, PoiStoreStaff poiStoreStaff, PrivilageCpUserStoreDO poiStore) throws Exception { OpCustomer insertCustomer = new OpCustomer(); insertCustomer.setWechatUniId(turnBackDTOS.getWxData().getUnionId()); insertCustomer.setName(turnBackDTOS.getName()); @@ -258,8 +265,6 @@ public class CustomerService { //有vip数据就不需要重新请求bsd的vip接口 vipCheck(turnBackDTOS); } - //todo 发送websocket放开 -// WebSocketController.sendInfo(new Gson().toJson(insertCustomer)); } /** diff --git a/src/main/java/com/kiisoo/ic/customer/mapper/OpVipDOMapper.java b/src/main/java/com/kiisoo/ic/customer/mapper/OpVipDOMapper.java index 84ba3d9..ff5254d 100644 --- a/src/main/java/com/kiisoo/ic/customer/mapper/OpVipDOMapper.java +++ b/src/main/java/com/kiisoo/ic/customer/mapper/OpVipDOMapper.java @@ -22,4 +22,7 @@ public interface OpVipDOMapper extends BaseMapper { * 会员总数 */ Long selectVipCount(@Param("shopIds") List shopIds, @Param("startDate") Date startDate, @Param("endDate") Date endDate); + + Long selectVipCountNew(); + } diff --git a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java index 5a065c5..de55c57 100644 --- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java +++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java @@ -113,7 +113,9 @@ public class CustomerViewService { .filter(contactDO -> contactDO.getNegativeFeedbackCnt() != null) .map(PoiCustomerContactDataStat::getNegativeFeedbackCnt).mapToLong(a -> a).sum(); //会员总数 - Long vipCount = opVipDOMapper.selectVipCount(shopIds, null, null); + //todo 会员数据暂时不能根据店铺查询 +// Long vipCount = opVipDOMapper.selectVipCount(shopIds, null, null); + Long vipCount = opVipDOMapper.selectVipCountNew(); List newCustimerList = customerList.stream().filter(customerDO -> filterCustomerByRegisterTime(customerDO, selectStartTime, selectEndTime)).collect(Collectors.toList()); //零售公司店均新增 diff --git a/src/main/resources/mapper/OpVipDOMapper.xml b/src/main/resources/mapper/OpVipDOMapper.xml index 64aa016..68ae2d6 100644 --- a/src/main/resources/mapper/OpVipDOMapper.xml +++ b/src/main/resources/mapper/OpVipDOMapper.xml @@ -24,20 +24,28 @@ + +