From 45cf9bb8fbf63e9fc03bb313a0e275f48b932c3e Mon Sep 17 00:00:00 2001 From: yechenhao Date: Sun, 31 May 2020 00:54:08 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A5=BD=E5=8F=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmployeeController.java | 6 ++-- .../kiisoo/ic/employee/entity/EmployeeDO.java | 4 +++ .../ic/employee/service/EmployeeService.java | 29 ++++++++----------- .../kiisoo/ic/store/entity/StoreUserDTO.java | 12 ++++++++ .../mapper/PrivilageCpUserStoreDOMapper.xml | 15 +++++++--- 5 files changed, 43 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java index 2076fbe..5eb1091 100644 --- a/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java +++ b/src/main/java/com/kiisoo/ic/employee/controller/EmployeeController.java @@ -197,9 +197,11 @@ public class EmployeeController extends BaseController { */ @RequestMapping(value = "update",method = RequestMethod.POST) @ResponseBody - public Map updateUser(@RequestBody EmployeeDO employee){ + public Map updateUser(@RequestParam("id")Long id,@RequestParam("mobile")String mobile, + @RequestParam("cpUserName")String cpUserName,@RequestParam("cpUserId")String cpUserId, + @RequestParam("alias")String alias){ try { - Boolean hasAdd = employeeService.updateUser(employee); + Boolean hasAdd = employeeService.updateUser(id,cpUserId,mobile,cpUserName,alias); return data(hasAdd); }catch (Exception e){ log.error("修改用户失败",e); diff --git a/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java b/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java index 15db79a..634daa4 100644 --- a/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java +++ b/src/main/java/com/kiisoo/ic/employee/entity/EmployeeDO.java @@ -28,6 +28,10 @@ public class EmployeeDO { * 员工名 */ private String name; + /** + * 企业微信名称 + */ + private String cpUserName; /** * 成员所属部门id列表,不超过20个(企业微信部门id，非数据库部门id) */ diff --git a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java index 31eaabf..c1590aa 100644 --- a/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java +++ b/src/main/java/com/kiisoo/ic/employee/service/EmployeeService.java @@ -33,6 +33,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestParam; import javax.imageio.ImageIO; import javax.servlet.ServletOutputStream; @@ -262,31 +263,25 @@ public class EmployeeService { * @throws WxErrorException */ @Transactional(rollbackFor = Exception.class) - public Boolean updateUser(EmployeeDO employee) throws Exception { + public Boolean updateUser(Long id, String cpUserId,String mobile,String cpUserName,String alias) throws Exception { PrivilageCpUserDO privilageCpUserDO = new PrivilageCpUserDO(); - BeanUtils.copyProperties(employee, privilageCpUserDO); - privilageCpUserDO.setCpUserId(employee.getUserId()); - + privilageCpUserDO.setId(id); + privilageCpUserDO.setMobile(mobile); + privilageCpUserDO.setName(cpUserName); + privilageCpUserDO.setAlias(alias); int update = privilageCpUserDOMapper.updateById(privilageCpUserDO); if (update == 0) { throw new Exception("修改成员失败"); } - //维护部门关系——删除原有部门关系 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(DATABASE_CP_USER_ID_KEY, privilageCpUserDO.getId()); - privilageCpUserDepartmentDOMapper.delete(queryWrapper); - - Long[] departIds = employee.getDepartIds(); - Integer[] orders = employee.getOrders(); - Integer[] isLeaderInDept = employee.getIsLeaderInDept(); - for (int i = 0; i < departIds.length; i++) { - PrivilageCpUserDepartmentDO relation = new PrivilageCpUserDepartmentDO(privilageCpUserDO.getId(), departIds[i], orders[i], isLeaderInDept[i]); - privilageCpUserDepartmentDOMapper.insert(relation); - } - //成功则添加用户到企业微信 + EmployeeDO employee = new EmployeeDO(); + employee.setName(cpUserName); + employee.setId(id); + employee.setAlias(alias); + employee.setUserId(cpUserId); + employee.setMobile(mobile); qwMailListManageService.updateUser(employee); return true; } diff --git a/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java b/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java index a73a0cd..6c583aa 100644 --- a/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java +++ b/src/main/java/com/kiisoo/ic/store/entity/StoreUserDTO.java @@ -18,6 +18,18 @@ public class StoreUserDTO extends PoiStore{ * 企业微信账号 */ private String cpUserId; + /** + * 企业微信账号 + */ + private String cpUserName; + /** + * 别名 + */ + private String alias; + /** + * 手机号 + */ + private String mobile; /** * privilage_cp_user 主键id */ diff --git a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml index 6fc9eb1..47a0582 100644 --- a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml +++ b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml @@ -3,8 +3,16 @@ @@ -79,10 +79,10 @@ CONCAT('%',#{search},'%')) - and date(t1.create_time) >= #{startDate} + and t1.create_time >= #{startDate} - and date(t1.create_time) <= #{endDate} + and t1.create_time <= #{endDate} order by t1.create_time desc From e4067e770345befdab5c0cdd74d1b9b1825c085e Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Sun, 31 May 2020 19:08:52 +0800 Subject: [PATCH 07/34] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic/customer/service/CustomerViewService.java | 13 +++++++++---- .../ic/employee/mapper/PrivilageCpUserDOMapper.java | 4 ++-- .../resources/mapper/PrivilageCpUserDOMapper.xml | 8 ++++---- 3 files changed, 15 insertions(+), 10 deletions(-) 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 d5bf7b2..da20fbc 100644 --- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java +++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java @@ -665,18 +665,23 @@ public class CustomerViewService { shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList()); List cpUserIds = privilageCpUserStoreDOMapper.selectCpUserIdsByStoreIds(shopIdList); Long all = privilageCpUserDOMapper.selectStoresCount(cpUserIds); - Long dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds); + List> dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds); result.setAllCustomer(all); - result.setAllValidCustomer(dis); + if(null != dis){ + result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows"))); + } + } //管理员/总运营人员 else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode())) { Long all = privilageCpUserDOMapper.selectAllCount(); - Long dis = privilageCpUserDOMapper.selectDistinctAllCount(); + List> dis = privilageCpUserDOMapper.selectDistinctAllCount(); result.setAllCustomer(all); - result.setAllValidCustomer(dis); + if(null != dis){ + result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows"))); + } } return result; diff --git a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java index 6da2e30..8e6211f 100644 --- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java +++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java @@ -19,7 +19,7 @@ public interface PrivilageCpUserDOMapper extends BaseMapper { Long selectAllCount(); - Long selectDistinctAllCount(); + List> selectDistinctAllCount(); List selectCustomerIdsByCpUserId(@Param("cpUserId")String cpUserId); @@ -29,7 +29,7 @@ public interface PrivilageCpUserDOMapper extends BaseMapper { Long selectStoresCount(@Param("cpUserIds")List cpUserIds); - Long selectDistinctStoresCount(@Param("cpUserIds")List cpUserIds); + List> selectDistinctStoresCount(@Param("cpUserIds")List cpUserIds); Long selectStoresCountById(@Param("shopIds")List shopIds); diff --git a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml index 23b83e0..28b7af0 100644 --- a/src/main/resources/mapper/PrivilageCpUserDOMapper.xml +++ b/src/main/resources/mapper/PrivilageCpUserDOMapper.xml @@ -22,8 +22,8 @@ select count(id) from op_cp_user_customer_relation - + EXPLAIN select count(distinct customer_user_id) from op_cp_user_customer_relation - + EXPLAIN select count(distinct customer_user_id) from op_cp_user_customer_relation where cp_user_id in #{item} From acea52a01c5c339863b1a547b423189fa91f08b1 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Sun, 31 May 2020 19:19:57 +0800 Subject: [PATCH 08/34] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kiisoo/ic/customer/service/CustomerViewService.java | 8 ++++---- .../ic/employee/mapper/PrivilageCpUserDOMapper.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 da20fbc..572d7d2 100644 --- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java +++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java @@ -665,22 +665,22 @@ public class CustomerViewService { shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList()); List cpUserIds = privilageCpUserStoreDOMapper.selectCpUserIdsByStoreIds(shopIdList); Long all = privilageCpUserDOMapper.selectStoresCount(cpUserIds); - List> dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds); + List> dis = privilageCpUserDOMapper.selectDistinctStoresCount(cpUserIds); result.setAllCustomer(all); if(null != dis){ - result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows"))); + result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows").toString())); } } //管理员/总运营人员 else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode())) { Long all = privilageCpUserDOMapper.selectAllCount(); - List> dis = privilageCpUserDOMapper.selectDistinctAllCount(); + List> dis = privilageCpUserDOMapper.selectDistinctAllCount(); result.setAllCustomer(all); if(null != dis){ - result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows"))); + result.setAllValidCustomer(Long.parseLong(dis.get(0).get("rows").toString())); } } diff --git a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java index 8e6211f..ca882d6 100644 --- a/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java +++ b/src/main/java/com/kiisoo/ic/employee/mapper/PrivilageCpUserDOMapper.java @@ -19,7 +19,7 @@ public interface PrivilageCpUserDOMapper extends BaseMapper { Long selectAllCount(); - List> selectDistinctAllCount(); + List> selectDistinctAllCount(); List selectCustomerIdsByCpUserId(@Param("cpUserId")String cpUserId); @@ -29,7 +29,7 @@ public interface PrivilageCpUserDOMapper extends BaseMapper { Long selectStoresCount(@Param("cpUserIds")List cpUserIds); - List> selectDistinctStoresCount(@Param("cpUserIds")List cpUserIds); + List> selectDistinctStoresCount(@Param("cpUserIds")List cpUserIds); Long selectStoresCountById(@Param("shopIds")List shopIds); From 752a417896ed2e760d0cea86881d4a347ad2e07a Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Sun, 31 May 2020 19:40:52 +0800 Subject: [PATCH 09/34] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index ef26e15..698e149 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ logging: level: - root: warn + root: info mybatis: mapperLocations: classpath:mapper/*.xml From 03880dae188f15f930797d023b11203e67707857 Mon Sep 17 00:00:00 2001 From: yechenhao Date: Sun, 31 May 2020 20:14:25 +0800 Subject: [PATCH 10/34] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E8=B4=AD=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml index 47a0582..a7bd507 100644 --- a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml +++ b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml @@ -40,7 +40,7 @@ from privilage_cp_user_store pcus ,privilage_cp_user pcu where pcus.cp_user_id = pcu.id and pcu.status in (1,4) and pcus.store_id = #{storeId} - order by pcus.id asc + order by pcus.id desc limit 1 From 85ad920b2e2fcb839ed69ce2205b4af50eb6ef48 Mon Sep 17 00:00:00 2001 From: yechenhao Date: Sun, 31 May 2020 21:36:17 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E8=B4=AD=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml index a7bd507..47a0582 100644 --- a/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml +++ b/src/main/resources/mapper/PrivilageCpUserStoreDOMapper.xml @@ -40,7 +40,7 @@ from privilage_cp_user_store pcus ,privilage_cp_user pcu where pcus.cp_user_id = pcu.id and pcu.status in (1,4) and pcus.store_id = #{storeId} - order by pcus.id desc + order by pcus.id asc limit 1 From 299aa09f2f471ee566fe99353c5622d759f2fedf Mon Sep 17 00:00:00 2001 From: yechenhao Date: Mon, 1 Jun 2020 01:14:42 +0800 Subject: [PATCH 12/34] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=AF=BC=E8=B4=AD=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerViewController.java | 17 ++++++ .../customer/service/CustomerViewService.java | 58 +++++++++++++++---- .../service/StorePromotionDataService.java | 2 + .../mapper/StorePromotionDataDOMapper.xml | 20 +++---- 4 files changed, 75 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java b/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java index b6eb310..98ee407 100644 --- a/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java +++ b/src/main/java/com/kiisoo/ic/customer/controller/CustomerViewController.java @@ -55,6 +55,23 @@ public class CustomerViewController extends BaseController { } } + /** + * 客户概览main——vip + * @param userId 用户id + * @return 客户概览VO + */ + @ResponseBody + @RequestMapping(value = "/main/vip", method = RequestMethod.GET) + public Map getMainVipCount(@RequestParam("userId")Long userId){ + try{ + CustomerViewVO result = customerViewService.getMainVipCount(userId); + return data(result); + }catch (Exception e){ + log.error("查询vip数据出错", e); + return fail(); + } + } + /** * 客户概览——Top榜 * @param userId 用户id 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 572d7d2..c5e6554 100644 --- a/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java +++ b/src/main/java/com/kiisoo/ic/customer/service/CustomerViewService.java @@ -174,8 +174,6 @@ public class CustomerViewService { */ public CustomerViewVO selectCustomerViewMain(Long userId, String selectStartTime, String selectEndTime, String startTime, String endTime){ CustomerViewVO customerViewVO = new CustomerViewVO(); - //会员总数 - Long vipCount = 0L; //shopIds List shopIdList = new ArrayList<>(); PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectRoleByUserId(userId); @@ -185,7 +183,6 @@ public class CustomerViewService { //店长 if(privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) { shopIdList = poiStoreStaffDOMapper.selectByUserId(userId); - vipCount = opVipDOMapper.selectVipCountByStoreIds(shopIdList); } //运营人员 else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) { @@ -195,12 +192,10 @@ public class CustomerViewService { //查询零售公司的门店 List list1 = retailCompanyService.selectShopByCompany(pm.get(0).getOrgId()); shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList()); - vipCount = opVipDOMapper.selectVipCountByStoreIds(shopIdList); } //管理员/总运营人员 else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode())) { shopIdList = poiStoreStaffDOMapper.selectAllShopId(null,null); - vipCount = opVipDOMapper.selectVipCountNew(); } if(CollectionUtils.isEmpty(shopIdList)){ @@ -209,17 +204,10 @@ public class CustomerViewService { //柱状图好友趋势图 List customerList = opCustomerDOMapper.selectCustomerList(shopIdList, null, null, startTime, endTime); - - customerViewVO.setAllVipCount(vipCount); - //设置趋势柱状图list List validCustomerList = customerList.stream().filter(customerDO -> VALID.equals(customerDO.getValidType())).collect(Collectors.toList()); handleChartData(customerList, validCustomerList, customerViewVO); - //设置新增好友，新增好友（去重），vip人数 -// setCustomerViewData(customerViewVO, customerList, validCustomerList, selectStartTime, selectEndTime); - //新增好友 -// Long newCustomerCount = customerList.stream().filter(customerDO -> filterCustomerByRegisterTime(customerDO, selectStartTime, selectEndTime)).count(); Integer newCustomerCount = opCustomerDOMapper.countCustomerByDate(shopIdList,selectStartTime, selectEndTime); customerViewVO.setNewCustomer(new Long(newCustomerCount)); @@ -229,6 +217,52 @@ public class CustomerViewService { return customerViewVO; } + + /** + * 客户概览main——vip + * @param userId 用户id + * @return 客户概览VO + */ + public CustomerViewVO getMainVipCount(Long userId){ + CustomerViewVO customerViewVO = new CustomerViewVO(); + //会员总数 + Long vipCount = 0L; + //shopIds + List shopIdList = new ArrayList<>(); + PrivilageRoleDO privilageRoleDO = privilageRoleDOMapper.selectRoleByUserId(userId); + if(privilageRoleDO == null){ + return customerViewVO; + } + //店长 + if(privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_DZ.getRoleCode())) { + shopIdList = poiStoreStaffDOMapper.selectByUserId(userId); + vipCount = opVipDOMapper.selectVipCountByStoreIds(shopIdList); + } + //运营人员 + else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_YYRY.getRoleCode())) { + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.eq("user_id", userId); + List pm = organizationalMemberMapper.selectList(wrapper1); + //查询零售公司的门店 + List list1 = retailCompanyService.selectShopByCompany(pm.get(0).getOrgId()); + shopIdList = list1.stream().map(PoiStore::getId).collect(Collectors.toList()); + vipCount = opVipDOMapper.selectVipCountByStoreIds(shopIdList); + } + //管理员/总运营人员 + else if (privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_GLY.getRoleCode()) || privilageRoleDO.getCode().equals(RoleEnum.ROLE_CODE_ALL_YYRY.getRoleCode())) { + shopIdList = poiStoreStaffDOMapper.selectAllShopId(null,null); + vipCount = opVipDOMapper.selectVipCountNew(); + } + + if(CollectionUtils.isEmpty(shopIdList)){ + return customerViewVO; + } + + customerViewVO.setAllVipCount(vipCount); + + return customerViewVO; + } + /** * 客户概览——Top榜 * @param userId 用户id diff --git a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java index a2d84e9..a9af635 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StorePromotionDataService.java @@ -28,6 +28,7 @@ import com.kiisoo.ic.store.entity.*; import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; import com.kiisoo.ic.store.mapper.StorePromotionDataDOMapper; +import com.kiisoo.ic.utils.DateUtils; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.cp.api.WxCpService; @@ -526,6 +527,7 @@ public class StorePromotionDataService { if (storeId == null) { return storePromotionDataDO; } + endDate = DateUtils.addDay(endDate,1); switch (roleCode) { // 店长 case Constants.WX_USER_ROLE_SHOP_MANAGER: diff --git a/src/main/resources/mapper/StorePromotionDataDOMapper.xml b/src/main/resources/mapper/StorePromotionDataDOMapper.xml index 97c781c..eeec817 100644 --- a/src/main/resources/mapper/StorePromotionDataDOMapper.xml +++ b/src/main/resources/mapper/StorePromotionDataDOMapper.xml @@ -293,10 +293,10 @@ SELECT count(t.customer_id) from op_seller_customer_relation t WHERE t.store_id = #{storeId} - and date(t.create_time) >= #{startDate} + and t.create_time >= #{startDate} - and date(t.create_time) <= #{endDate} + and t.create_time < #{endDate} group by t.store_id @@ -308,10 +308,10 @@ AND t2.user_id = #{userId} - and date(t1.create_time) >= #{startDate} + and t1.create_time >= #{startDate} - and date(t1.create_time) <= #{endDate} + and t1.create_time < #{endDate} group by t1.user_id @@ -329,10 +329,10 @@ WHERE t. store_id = #{storeId} - and date(t.create_time) >= #{startDate} + and t.create_time >= #{startDate} - and date(t.create_time) <= #{endDate} + and t.create_time < #{endDate} GROUP BY t.user_id @@ -368,10 +368,10 @@ `op_seller_customer_relation` t2 where 1=1 - and date(t2.create_time) >= #{startDate} + and t2.create_time >= #{startDate} - and date(t2.create_time) <= #{endDate} + and t2.create_time < #{endDate} GROUP BY t2.store_id @@ -390,10 +390,10 @@ poi_store_staff t1, `op_seller_customer_relation` t2 where t1.id = t2.user_id - and date(t2.create_time) >= #{startDate} + and t2.create_time >= #{startDate} - and date(t2.create_time) <= #{endDate} + and t2.create_time < #{endDate} and t1.store_id = #{storeId} and t1.type = 4 From 57bb7048cfcfe0fc862b8ffe22e77cc69ba35a07 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Mon, 1 Jun 2020 01:26:08 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 76 +++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index b01ad16..b999711 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.kiisoo ic 1.0-SNAPSHOT - jar + war youke @@ -25,17 +25,25 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.0.0 + + org.projectlombok @@ -45,6 +53,13 @@ org.springframework.boot spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-tomcat + + org.springframework.boot @@ -110,6 +125,12 @@ fastjson 1.2.31 + + + com.google.code.gson + gson + 2.8.5 + org.springframework.boot @@ -156,6 +177,18 @@ + + org.springframework.boot + spring-boot-starter-test + test + + + net.jodah expiringmap @@ -172,7 +205,11 @@ commons-codec 1.9 - + + com.squareup.okhttp3 + okhttp + 3.4.1 + com.google.code.gson gson @@ -219,6 +256,18 @@ 2.5.1 + + + org.apache.poi + poi + 3.16 + + + org.apache.poi + poi-ooxml + 3.16 + + org.apache.shiro shiro-spring @@ -282,6 +331,7 @@ false + maven-surefire-plugin From bc502c673cd9abb424a3b30b0b048b75f091cb24 Mon Sep 17 00:00:00 2001 From: yechenhao Date: Mon, 1 Jun 2020 02:29:30 +0800 Subject: [PATCH 14/34] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kiisoo/ic/customer/CustomerService.java | 27 +++++++++++++------ .../entity/OpSellerCustomerRelation.java | 12 ++++++++- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 6034b82..640fe90 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -295,6 +295,10 @@ public class CustomerService { insertCustomer.setExternalUserid(turnBackDTOS.getWxData().getUserId()); insertCustomer.setCpUserId(turnBackDTOS.getUserId()); insertCustomer.setPhone(turnBackDTOS.getPhone()); + if (turnBackDTOS.getVipData() != null && !turnBackDTOS.getVipData().getPhone().equals("")) { + //有vip数据就不需要重新请求bsd的vip接口 + insertCustomer.setPhone(turnBackDTOS.getVipData().getPhone()); + } if (shop != null && StringUtils.isNotBlank(shop.getName())) { insertCustomer.setShopName(shop.getName()); } @@ -427,8 +431,12 @@ public class CustomerService { insertRelation.setCreateTime(joinTime); insertRelation.setUpdateTime(new Date()); insertRelation.setCustomerId(opCustomer.getId()); + PoiStore poiStore = poiStoreDOMapper.selectById(shopId); insertRelation.setStoreId(shopId); + insertRelation.setStoreCode(poiStore.getCode()); + PoiStoreStaff staff = poiStoreStaffDOMapper.selectById(sellerId); insertRelation.setUserId(sellerId); + insertRelation.setStaffCode(staff.getStaffCode()); insertRelation.setCreateBy(Constants.SYS_OPERATION); insertRelation.setUpdateBy(Constants.SYS_OPERATION); @@ -446,14 +454,14 @@ public class CustomerService { opSellerCustomerRelationDOMapper.insert(insertRelation); } else { //可能是同步过来的数据，此时已经存在的话，用有导购的代替 - opSellerCustomerRelation.setCreateTime(joinTime); - opSellerCustomerRelation.setUpdateTime(new Date()); - opSellerCustomerRelation.setCustomerId(opCustomer.getId()); - opSellerCustomerRelation.setStoreId(shopId); - opSellerCustomerRelation.setUserId(sellerId); - opSellerCustomerRelation.setCreateBy(Constants.SYS_OPERATION); - opSellerCustomerRelation.setUpdateBy(Constants.SYS_OPERATION); - opSellerCustomerRelationDOMapper.updateById(opSellerCustomerRelation); +// opSellerCustomerRelation.setCreateTime(joinTime); +// opSellerCustomerRelation.setUpdateTime(new Date()); +// opSellerCustomerRelation.setCustomerId(opCustomer.getId()); +// opSellerCustomerRelation.setStoreId(shopId); +// opSellerCustomerRelation.setUserId(sellerId); +// opSellerCustomerRelation.setCreateBy(Constants.SYS_OPERATION); +// opSellerCustomerRelation.setUpdateBy(Constants.SYS_OPERATION); +// opSellerCustomerRelationDOMapper.updateById(opSellerCustomerRelation); } } @@ -499,6 +507,9 @@ public class CustomerService { } insertRelation.setType(3); + }else{ + PoiStore poiStore = poiStoreDOMapper.selectById(shopId); + insertRelation.setStoreCode(poiStore.getCode()); } opSellerCustomerRelationDOMapper.insert(insertRelation); } diff --git a/src/main/java/com/kiisoo/ic/customer/entity/OpSellerCustomerRelation.java b/src/main/java/com/kiisoo/ic/customer/entity/OpSellerCustomerRelation.java index 9867cfb..0044bdc 100644 --- a/src/main/java/com/kiisoo/ic/customer/entity/OpSellerCustomerRelation.java +++ b/src/main/java/com/kiisoo/ic/customer/entity/OpSellerCustomerRelation.java @@ -26,16 +26,26 @@ public class OpSellerCustomerRelation { */ private Long userId; + /** + * 导购code + */ + private String staffCode; + /** * 客户ID */ private Long customerId; /** - * 店铺ID + * 店铺code */ private Long storeId; + /** + * 店铺ID + */ + private String storeCode; + /** * 是否有效 */ From d87dabb7d798596ae5b99a2566af39c3d2d43160 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Mon, 1 Jun 2020 05:02:07 +0800 Subject: [PATCH 15/34] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/OpCustomerDOMapper.xml | 60 +++++++++++++++---- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/src/main/resources/mapper/OpCustomerDOMapper.xml b/src/main/resources/mapper/OpCustomerDOMapper.xml index 9fc8a86..2ed685f 100644 --- a/src/main/resources/mapper/OpCustomerDOMapper.xml +++ b/src/main/resources/mapper/OpCustomerDOMapper.xml @@ -12,7 +12,8 @@ left join poi_store_staff t5 ON t5.store_id = t0.id and t1.user_id = t5.id LEFT JOIN op_customer t2 ON t2.id = t1.customer_id LEFT JOIN op_vip t3 ON t3.id = t2.member_id - LEFT JOIN privilage_user t4 ON t4.id = t5.user_id where 1 =1 + LEFT JOIN privilage_user t4 ON t4.id = t5.user_id + where t1.id > 0 and t1.store_id in @@ -25,13 +26,37 @@ - and t2.create_time >= #{startDate} + and t1.create_time >= #{startDate} - and t2.create_time #{endDate} + and t1.create_time #{endDate} - order by t2.create_time desc,t2.id desc,t1.user_id desc + order by t1.create_time desc,t1.customer_id desc,t1.user_id desc + + + + + + From fc048048606f4041df3dfcbb880b1c9991a54bbc Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Mon, 1 Jun 2020 05:07:29 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kiisoo/ic/job/detail/CustomerDataJob.java | 26 +++++++++++++------ .../wx/service/QWMailListManageService.java | 17 ++++++++---- src/test/java/test/JobTest.java | 5 +++- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java b/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java index a6cf968..1f385be 100644 --- a/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java +++ b/src/main/java/com/kiisoo/ic/job/detail/CustomerDataJob.java @@ -14,14 +14,13 @@ import com.lmax.disruptor.*; import com.lmax.disruptor.dsl.Disruptor; import com.lmax.disruptor.dsl.ProducerType; import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.cp.bean.WxCpUser; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.*; /** @@ -60,7 +59,7 @@ public class CustomerDataJob { private RedisUtil redisUtil; - public void handle(String cpUserIds) { + public void handle(String cpUserIds) throws WxErrorException { //创建线程池 ExecutorService executors = Executors.newFixedThreadPool(THREAD_NUMBERS); @@ -109,14 +108,25 @@ public class CustomerDataJob { index++; } } else { - String[] split = cpUserIds.split(","); - List cpUserIdList = Arrays.asList(split); +// String[] split = cpUserIds.split(","); +// List cpUserIdList = Arrays.asList(split); + List cpUserIdList = new ArrayList<>(); + + List wxCpUsers = qwMailListManageService.syncUser(); + + for (int i = 0; i < wxCpUsers.size(); i++) { + WxCpUser item = wxCpUsers.get(i); + cpUserIdList.add(item.getUserId()); + } + // 获取账号的总客户数 List> customerList = opSellerCustomerRelationDOMapper.selectCustomersByCpUserIdByList(cpUserIdList); Map customerMap = new HashMap<>(); for (int i = 0; i < customerList.size(); i++) { Map item = customerList.get(i); - customerMap.put(item.get("cpUserId").toString(), item.get("sumCustomer")); + if(null != item.get("cpUserId")){ + customerMap.put(item.get("cpUserId").toString(), item.get("sumCustomer")); + } } for (String cpUserId : cpUserIdList) { diff --git a/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java b/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java index 31adf06..6ec7ee1 100644 --- a/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java +++ b/src/main/java/com/kiisoo/ic/wx/service/QWMailListManageService.java @@ -24,6 +24,7 @@ import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.cp.api.*; import me.chanjar.weixin.cp.bean.*; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -430,6 +431,8 @@ public class QWMailListManageService { return customers; } + private File file = new File("file/601.txt"); + public void getCustomerNew(String cpUserId, Integer sumCustomer, CustomerService customerService, List> tagList) throws WxErrorException { //查询店铺id——店铺ID存在说明该账号的客户都绑在店上，不存在则说明绑在账号上 // Long storeId = privilageCpUserStoreDOMapper.selectOneByCpUserId(cpUserId); @@ -514,12 +517,16 @@ public class QWMailListManageService { wxDataDTO.setUnionId(externalContact.getUnionId()); turnBackDTO.setWxData(wxDataDTO); // SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// Date jtime = sdf.parse(turnBackDTO.getJoinTime()); -// Date etime = sdf.parse("2020-05-28 00:00:00"); -// if (jtime.before(etime)) { +// Date jtime = sdf.parse(turnBackDTO.getJoinTime()); +// Date stime = sdf.parse("2020-05-25 00:00:00"); +// Date etime = sdf.parse("2020-05-26 00:00:00"); +// +// +// if (jtime.after(stime) && jtime.before(etime)) { //// System.out.println("aa" + turnBackDTO.toString()); -// continue; -// } +// FileUtils.write(file, turnBackDTO.toString() + "\n","utf-8", true); +// continue; +// } // System.out.println(turnBackDTO.toString()); customerService.turnBack(turnBackDTO); diff --git a/src/test/java/test/JobTest.java b/src/test/java/test/JobTest.java index a27f5d3..0005318 100644 --- a/src/test/java/test/JobTest.java +++ b/src/test/java/test/JobTest.java @@ -57,7 +57,10 @@ public class JobTest { // 13278869965 // 19906239800 String cpUserIds = "17386133351"; - customerDataJob.handle(null); + + + + customerDataJob.handle(cpUserIds); // List cpUserIds = dataAccountDOMapper.selectByAccount(); // customerDataJob.handleList(cpUserIds); log.info("<--获取联系客户统计数据定时任务结束-->"); From 6ddce8ab7903afca87a9244b2e79de6a60502d43 Mon Sep 17 00:00:00 2001 From: zhenghuang <236220500@qq.com> Date: Tue, 19 May 2020 15:21:40 +0800 Subject: [PATCH 17/34] swagger mysql --- .../ic/activity/vo/ActivityInstanceVO.java | 13 ++++++++++++ .../ic/activity/vo/ActivityScheduleVO.java | 21 +++++++++++++++++++ .../activity/PmnActivityInstanceMapper.xml | 5 +++++ 3 files changed, 39 insertions(+) create mode 100644 src/main/java/com/kiisoo/ic/activity/vo/ActivityInstanceVO.java create mode 100644 src/main/java/com/kiisoo/ic/activity/vo/ActivityScheduleVO.java create mode 100644 src/main/resources/mapper/activity/PmnActivityInstanceMapper.xml diff --git a/src/main/java/com/kiisoo/ic/activity/vo/ActivityInstanceVO.java b/src/main/java/com/kiisoo/ic/activity/vo/ActivityInstanceVO.java new file mode 100644 index 0000000..19ec9ef --- /dev/null +++ b/src/main/java/com/kiisoo/ic/activity/vo/ActivityInstanceVO.java @@ -0,0 +1,13 @@ +package com.kiisoo.ic.activity.vo; + +import com.kiisoo.ic.activity.entity.PmnActivityInstance; +import com.kiisoo.ic.activity.entity.PmnActivityPromotionCase; +import com.kiisoo.ic.store.entity.PoiStore; +import lombok.Data; + +@Data +public class ActivityInstanceVO extends PmnActivityInstance { + private PoiStore store; + + private PmnActivityPromotionCase activityPromotionCase; +} diff --git a/src/main/java/com/kiisoo/ic/activity/vo/ActivityScheduleVO.java b/src/main/java/com/kiisoo/ic/activity/vo/ActivityScheduleVO.java new file mode 100644 index 0000000..e714643 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/activity/vo/ActivityScheduleVO.java @@ -0,0 +1,21 @@ +package com.kiisoo.ic.activity.vo; + +import com.kiisoo.ic.activity.entity.PmnActivityCategory; +import com.kiisoo.ic.activity.entity.PmnActivityPromotionCase; +import com.kiisoo.ic.activity.entity.PmnActivityPromotionParam; +import com.kiisoo.ic.activity.entity.PmnActivitySchedule; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel(value = "活动规划", parent = PmnActivitySchedule.class) +public class ActivityScheduleVO extends PmnActivitySchedule { + @ApiModelProperty("活动参数列表") + List activityPromotionParams; + + @ApiModelProperty("活动类型列表") + List activityPromotionCases; +} diff --git a/src/main/resources/mapper/activity/PmnActivityInstanceMapper.xml b/src/main/resources/mapper/activity/PmnActivityInstanceMapper.xml new file mode 100644 index 0000000..2c6592b --- /dev/null +++ b/src/main/resources/mapper/activity/PmnActivityInstanceMapper.xml @@ -0,0 +1,5 @@ + + + + + From 78c2900b9010b294d913e5004d7933dc190e4763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Fri, 22 May 2020 18:32:58 +0800 Subject: [PATCH 18/34] 1 --- .../com/kiisoo/ic/customer/CustomerService.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 640fe90..1b22a2f 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -10,6 +10,13 @@ import com.google.gson.Gson; import com.kiisoo.ic.activity.bean.ActivityInstanceVO; import com.kiisoo.ic.activity.entity.*; import com.kiisoo.ic.activity.service.*; +import com.kiisoo.ic.common.utils.RedisUtil; +import com.kiisoo.ic.activity.bean.ActivityInstanceVO; +import com.kiisoo.ic.activity.entity.PmnActivityInstanceConfig; +import com.kiisoo.ic.activity.entity.PmnPromotionSrc; +import com.kiisoo.ic.activity.service.IPmnActivityInstanceConfigService; +import com.kiisoo.ic.activity.service.IPmnActivityInstanceService; +import com.kiisoo.ic.activity.service.IPmnPromotionSrcService; import com.kiisoo.ic.constants.Constants; import com.kiisoo.ic.customer.bean.CustomerDTO; import com.kiisoo.ic.customer.bean.CustomerModifyDTO; @@ -112,11 +119,10 @@ public class CustomerService { private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService; @Autowired - private StoreEmployeeService storeEmployeeService; - @Autowired - private IPmnActivityStoreRelationService pmnActivityStoreRelationService; + private IPmnPromotionSrcService pmnPromotionSrcService; + @Autowired - private IPmnPromotionFriendsSrcService pmnPromotionFriendsSrcService; + private StoreEmployeeService storeEmployeeService; /** * token */ From ceaef4554552a9f68fccb1d691449fc2144c0d40 Mon Sep 17 00:00:00 2001 From: zyy Date: Sat, 23 May 2020 09:56:02 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E5=AF=BC=E8=B4=AD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kiisoo/ic/store/service/StoreEmployeeService.java | 2 +- .../java/com/kiisoo/ic/system/entity/PrivilageUserDO.java | 2 +- .../ic/system/service/impl/PrivilageAccountServiceImpl.java | 4 ++-- .../ic/system/service/impl/PrivilageUserServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index 1469531..d24446c 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -1424,7 +1424,7 @@ public class StoreEmployeeService { PrivilageUserDO us = new PrivilageUserDO(); us.setName(shop.getName()); - us.setMobil(poiStoreStaffVO.getMobil()); + us.setMobile(poiStoreStaffVO.getMobil()); us.setEmail(""); us.setAddress(""); us.setStatus(1); diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java index 9599ab5..7ad60bc 100644 --- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java +++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java @@ -41,7 +41,7 @@ public class PrivilageUserDO implements Serializable { /** * 电话 */ - private String mobil; + private String mobile; /** * 邮箱 diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java index de9f4a3..0bae9eb 100644 --- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java @@ -267,7 +267,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl mobileUserQw = new QueryWrapper<>(); mobileUserQw.eq("mobil", mobil).eq("status", "1"); List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); - if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) { + if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) { return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType(); } @@ -286,7 +286,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl Date: Mon, 25 May 2020 16:43:13 +0800 Subject: [PATCH 20/34] swagger mysql --- src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java | 2 ++ src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java index 05a4153..2b18c30 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java @@ -36,6 +36,8 @@ public class PromotionSrcVO { private PoiStore store; + private PoiStore store; + private Long caseId; private Long status; diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java index 68664e6..6263cc5 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java @@ -55,8 +55,6 @@ public class PoiStoreService { @Autowired private RetailCompanyMapper retailCompanyMapper; @Autowired - private IPmnActivityInstanceService pmnActivityInstanceService; - @Autowired private IPmnActivityStoreRelationService storeRelationService; /** From 65c7072bec347f4b73c44e9ed8c2f1aa08b94882 Mon Sep 17 00:00:00 2001 From: zhenghuang <236220500@qq.com> Date: Tue, 26 May 2020 16:24:38 +0800 Subject: [PATCH 21/34] swagger mysql --- src/test/java/test/Test.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/java/test/Test.java b/src/test/java/test/Test.java index 500936b..28d656b 100644 --- a/src/test/java/test/Test.java +++ b/src/test/java/test/Test.java @@ -1,10 +1,14 @@ package test; +import com.kiisoo.ic.activity.entity.PmnActivityStoreRelation; +import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kiisoo.ic.activity.entity.*; import com.kiisoo.ic.activity.service.*; import com.kiisoo.ic.app.IcApplication; +import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; +import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.common.utils.RedisUtil; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; import com.kiisoo.ic.employee.service.EmployeeService; @@ -34,6 +38,8 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import java.util.List; + import java.io.File; import java.io.IOException; import java.util.HashMap; From ddca74ff7bc245341ac2f53ae982f44b5dfcf199 Mon Sep 17 00:00:00 2001 From: zhenghuang <236220500@qq.com> Date: Fri, 29 May 2020 15:53:47 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8,=E6=AC=A2?= =?UTF-8?q?=E8=BF=8E=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PmnActivityInstanceServiceImpl.java | 49 +++++++++++++++++++ src/test/java/test/Test.java | 7 +++ 2 files changed, 56 insertions(+) diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java index f8a87be..9f62f73 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java @@ -393,4 +393,53 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpllambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2)); } } + + @Transactional + @Override + public void scanValidAndSet() { + Date now = new Date(); + List starts = pmnActivityInstanceService.list(Wrappers.lambdaQuery().eq(PmnActivityInstance::getStatus, 1).le(PmnActivityInstance::getBeginTime, now).ge(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId)); + if(starts.size() > 0) { + starts.stream().forEach(item -> item.setStatus(2L)); + Set startInstances = starts.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet()); + pmnActivityInstanceService.updateBatchById(starts); + PmnPromotionSrc startPromotionSrc = new PmnPromotionSrc(); + startPromotionSrc.setStatus(1L); + PmnActivityInstanceConfig startConfig = new PmnActivityInstanceConfig(); + startConfig.setStatus(1L); + PmnActivityStoreRelation startStoreRelation = new PmnActivityStoreRelation(); + startStoreRelation.setStatus(1); + PmnActivityPromotionCase startCase = new PmnActivityPromotionCase(); + startCase.setStatus(1L); + pmnPromotionSrcService.update(startPromotionSrc, Wrappers.lambdaQuery().in(PmnPromotionSrc::getInstanceId, startInstances).ne(PmnPromotionSrc::getStatus, 1)); + pmnActivityInstanceConfigService.update(startConfig, Wrappers.lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, startInstances).ne(PmnActivityInstanceConfig::getStatus, 1)); + pmnActivityStoreRelationService.update(startStoreRelation, Wrappers.lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, startInstances).ne(PmnActivityStoreRelation::getStatus, 1)); + pmnActivityPromotionCaseService.update(startCase, Wrappers.lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, startInstances).ne(PmnActivityPromotionCase::getStatus, 1)); + log.info("starts: {}", starts); + } + } + + @Transactional + @Override + public void scanInvalidAndSer() { + Date now = new Date(); + List ends = pmnActivityInstanceService.list(Wrappers.lambdaQuery().ne(PmnActivityInstance::getStatus, 3).ne(PmnActivityInstance::getStatus, 4).le(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId)); + if(ends.size() > 0) { + ends.stream().forEach(item -> item.setStatus(3L)); + Set endInstances = ends.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet()); + pmnActivityInstanceService.updateBatchById(ends); + PmnPromotionSrc endPromotionSrc = new PmnPromotionSrc(); + endPromotionSrc.setStatus(2L); + PmnActivityInstanceConfig endConfig = new PmnActivityInstanceConfig(); + endConfig.setStatus(2L); + PmnActivityStoreRelation endStoreRelation = new PmnActivityStoreRelation(); + endStoreRelation.setStatus(2); + PmnActivityPromotionCase endCase = new PmnActivityPromotionCase(); + endCase.setStatus(2L); + pmnPromotionSrcService.update(endPromotionSrc, Wrappers.lambdaQuery().in(PmnPromotionSrc::getInstanceId, endInstances).ne(PmnPromotionSrc::getStatus, 2)); + pmnActivityInstanceConfigService.update(endConfig, Wrappers.lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, endInstances).ne(PmnActivityInstanceConfig::getStatus, 2)); + pmnActivityStoreRelationService.update(endStoreRelation, Wrappers.lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, endInstances).ne(PmnActivityStoreRelation::getStatus, 2)); + pmnActivityPromotionCaseService.update(endCase, Wrappers.lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2)); + } + } } diff --git a/src/test/java/test/Test.java b/src/test/java/test/Test.java index 28d656b..3329584 100644 --- a/src/test/java/test/Test.java +++ b/src/test/java/test/Test.java @@ -1,5 +1,8 @@ package test; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kiisoo.ic.activity.entity.*; +import com.kiisoo.ic.activity.service.*; import com.kiisoo.ic.activity.entity.PmnActivityStoreRelation; import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -21,6 +24,7 @@ import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.service.StoreEmployeeService; import com.kiisoo.ic.wx.service.AddWXService; +import lombok.extern.slf4j.Slf4j; import com.kiisoo.ic.wx.service.QWMailListManageService; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; @@ -38,7 +42,10 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import java.util.Date; import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import java.io.File; import java.io.IOException; From ae7840dd44b79724b3b0eeba3606a13d8b15c8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Sun, 31 May 2020 15:04:06 +0800 Subject: [PATCH 23/34] 1 --- .../java/com/kiisoo/ic/customer/CustomerService.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 1b22a2f..0109f6d 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -12,11 +12,8 @@ import com.kiisoo.ic.activity.entity.*; import com.kiisoo.ic.activity.service.*; import com.kiisoo.ic.common.utils.RedisUtil; import com.kiisoo.ic.activity.bean.ActivityInstanceVO; -import com.kiisoo.ic.activity.entity.PmnActivityInstanceConfig; -import com.kiisoo.ic.activity.entity.PmnPromotionSrc; -import com.kiisoo.ic.activity.service.IPmnActivityInstanceConfigService; -import com.kiisoo.ic.activity.service.IPmnActivityInstanceService; -import com.kiisoo.ic.activity.service.IPmnPromotionSrcService; +import com.kiisoo.ic.activity.entity.*; +import com.kiisoo.ic.activity.service.*; import com.kiisoo.ic.constants.Constants; import com.kiisoo.ic.customer.bean.CustomerDTO; import com.kiisoo.ic.customer.bean.CustomerModifyDTO; @@ -123,6 +120,10 @@ public class CustomerService { @Autowired private StoreEmployeeService storeEmployeeService; + @Autowired + private IPmnActivityStoreRelationService pmnActivityStoreRelationService; + @Autowired + private IPmnPromotionFriendsSrcService pmnPromotionFriendsSrcService; /** * token */ From 2830abbe3a5f2b773a51217247a6724cc689b809 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Mon, 1 Jun 2020 07:19:30 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/ActivityInstanceVO.java~HEAD | 97 +++++++++++++++++++ .../bean/ActivityScheduleVO.java~HEAD | 46 +++++++++ 2 files changed, 143 insertions(+) create mode 100644 src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java~HEAD create mode 100644 src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java~HEAD diff --git a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java~HEAD b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java~HEAD new file mode 100644 index 0000000..bee67e8 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java~HEAD @@ -0,0 +1,97 @@ +package com.kiisoo.ic.activity.bean; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kiisoo.ic.activity.entity.PmnActivityPromotionParam; +import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; +import com.kiisoo.ic.store.entity.PoiStore; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel("活动实例") +public class ActivityInstanceVO implements Serializable { + + @ApiModelProperty(value = "活动实例ID,有就编辑无则新增") + private Long id; + + @ApiModelProperty(value = "活动池ID", required = true) + @NotNull(message = "请输入活动池ID") + private Long scheduleId; + + @ApiModelProperty(value = "活动池信息", hidden = true) + private ActivityScheduleVO scheduleVO; + + @ApiModelProperty(value = "类型CODE", hidden = true) + private String categoryCode; + + + @ApiModelProperty(value = "活动名称", required = true) + @NotBlank(message = "请输入活动名称") + private String name; + + @ApiModelProperty(value = "活动开始日期", required = true) + @NotNull(message = "请输入活动开始日期") + @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8") + private Date beginTime; + + @ApiModelProperty(value = "活动结束日期", required = true) + @NotNull(message = "请输入活动结束日期") + @JsonFormat(pattern="yyyy-MM-dd", timezone = "GMT+8") + private Date endTime; + + private String content; + + @ApiModelProperty(value = "活动类型，多选项", required = true) + @NotNull(message = "请选择活动类型") + @Size(min = 1, message = "请选择活动类型") + private List params; + + @ApiModelProperty(value = "选择的企业列表", required = true) +// @NotNull(message = "请选择企业列表") +// @Size(min = 1, message = "请选择企业列表") + private List organizations; + + @ApiModelProperty(value = "第一个店铺名", hidden = true) + private String storeName; + @ApiModelProperty(value = "所有店铺数", hidden = true) + private String storeCount; + + @ApiModelProperty(value = "创建时间", hidden = true) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty(value = "更新时间", hidden = true) + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; + + @ApiModelProperty(value = "第一个公司名", hidden = true) + private String companyName; + @ApiModelProperty(value = "所有公司数", hidden = true) + private String companyCount; + + + @ApiModelProperty(value = "选择的店铺列表", required = true) + @NotNull(message = "请选择店铺列表") + @Size(min = 1, message = "请选择店铺列表") + private List stores; // 店铺列表 + + @ApiModelProperty(value = "状态", hidden = true) + private int status; + /* + *分页总条数 + */ + @ApiModelProperty(value = "分页总条数", hidden = true) + private long totalSize; + + /**序号*/ + @ApiModelProperty(value = "序号", hidden = true) + private int number; +} diff --git a/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java~HEAD b/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java~HEAD new file mode 100644 index 0000000..1df0931 --- /dev/null +++ b/src/main/java/com/kiisoo/ic/activity/bean/ActivityScheduleVO.java~HEAD @@ -0,0 +1,46 @@ +package com.kiisoo.ic.activity.bean; + +import com.kiisoo.ic.activity.entity.PmnActivityPromotionParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.List; + +@Data +public class ActivityScheduleVO { + + @ApiModelProperty(value = "活动池ID,有就编辑无则新增") + private Long id; + + @ApiModelProperty(value = "活动池名称", required = true) + @NotBlank(message = "请输入活动池名称") + private String name; + + @ApiModelProperty(value = "分类ID", required = true) + private Integer categoryId; + + @ApiModelProperty(value = "分类CODE", required = true) + private String categoryCode; + + @ApiModelProperty(value = "活动池图片", required = true) + private String logo; + + @ApiModelProperty(value = "活动池描述") + private String description; + + @ApiModelProperty(value = "APPID", required = true) + @NotBlank(message = "请输入APPID") + private String appId; + + @ApiModelProperty(value = "URI", required = true) + @NotBlank(message = "请输入uri") + private String uri; + + @ApiModelProperty(value = "活动类型", required = true) + @NotNull(message = "至少新增一个活动类型") + @Size(min = 1, message = "至少新增一个活动类型") + private List params; +} From b4c31188273cdf1d715222e493b79362a5e0109e Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Mon, 1 Jun 2020 16:23:10 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic/activity/bean/PromotionSrcVO.java | 2 - .../impl/PmnActivityInstanceServiceImpl.java | 49 ------------------- .../kiisoo/ic/customer/CustomerService.java | 4 +- .../ic/store/service/PoiStoreService.java | 2 + .../store/service/StoreEmployeeService.java | 2 +- .../ic/system/entity/PrivilageUserDO.java | 2 +- .../impl/PrivilageAccountServiceImpl.java | 4 +- .../impl/PrivilageUserServiceImpl.java | 2 +- 8 files changed, 8 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java index 2b18c30..05a4153 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java @@ -36,8 +36,6 @@ public class PromotionSrcVO { private PoiStore store; - private PoiStore store; - private Long caseId; private Long status; diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java index 9f62f73..f8a87be 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java @@ -393,53 +393,4 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpllambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2)); } } - - @Transactional - @Override - public void scanValidAndSet() { - Date now = new Date(); - List starts = pmnActivityInstanceService.list(Wrappers.lambdaQuery().eq(PmnActivityInstance::getStatus, 1).le(PmnActivityInstance::getBeginTime, now).ge(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId)); - if(starts.size() > 0) { - starts.stream().forEach(item -> item.setStatus(2L)); - Set startInstances = starts.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet()); - pmnActivityInstanceService.updateBatchById(starts); - PmnPromotionSrc startPromotionSrc = new PmnPromotionSrc(); - startPromotionSrc.setStatus(1L); - PmnActivityInstanceConfig startConfig = new PmnActivityInstanceConfig(); - startConfig.setStatus(1L); - PmnActivityStoreRelation startStoreRelation = new PmnActivityStoreRelation(); - startStoreRelation.setStatus(1); - PmnActivityPromotionCase startCase = new PmnActivityPromotionCase(); - startCase.setStatus(1L); - pmnPromotionSrcService.update(startPromotionSrc, Wrappers.lambdaQuery().in(PmnPromotionSrc::getInstanceId, startInstances).ne(PmnPromotionSrc::getStatus, 1)); - pmnActivityInstanceConfigService.update(startConfig, Wrappers.lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, startInstances).ne(PmnActivityInstanceConfig::getStatus, 1)); - pmnActivityStoreRelationService.update(startStoreRelation, Wrappers.lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, startInstances).ne(PmnActivityStoreRelation::getStatus, 1)); - pmnActivityPromotionCaseService.update(startCase, Wrappers.lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, startInstances).ne(PmnActivityPromotionCase::getStatus, 1)); - log.info("starts: {}", starts); - } - } - - @Transactional - @Override - public void scanInvalidAndSer() { - Date now = new Date(); - List ends = pmnActivityInstanceService.list(Wrappers.lambdaQuery().ne(PmnActivityInstance::getStatus, 3).ne(PmnActivityInstance::getStatus, 4).le(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId)); - if(ends.size() > 0) { - ends.stream().forEach(item -> item.setStatus(3L)); - Set endInstances = ends.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet()); - pmnActivityInstanceService.updateBatchById(ends); - PmnPromotionSrc endPromotionSrc = new PmnPromotionSrc(); - endPromotionSrc.setStatus(2L); - PmnActivityInstanceConfig endConfig = new PmnActivityInstanceConfig(); - endConfig.setStatus(2L); - PmnActivityStoreRelation endStoreRelation = new PmnActivityStoreRelation(); - endStoreRelation.setStatus(2); - PmnActivityPromotionCase endCase = new PmnActivityPromotionCase(); - endCase.setStatus(2L); - pmnPromotionSrcService.update(endPromotionSrc, Wrappers.lambdaQuery().in(PmnPromotionSrc::getInstanceId, endInstances).ne(PmnPromotionSrc::getStatus, 2)); - pmnActivityInstanceConfigService.update(endConfig, Wrappers.lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, endInstances).ne(PmnActivityInstanceConfig::getStatus, 2)); - pmnActivityStoreRelationService.update(endStoreRelation, Wrappers.lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, endInstances).ne(PmnActivityStoreRelation::getStatus, 2)); - pmnActivityPromotionCaseService.update(endCase, Wrappers.lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2)); - } - } } diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 0109f6d..7c305fa 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -1,6 +1,7 @@ package com.kiisoo.ic.customer; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.pagehelper.Page; @@ -115,9 +116,6 @@ public class CustomerService { @Autowired private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService; - @Autowired - private IPmnPromotionSrcService pmnPromotionSrcService; - @Autowired private StoreEmployeeService storeEmployeeService; @Autowired diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java index 6263cc5..68664e6 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java @@ -55,6 +55,8 @@ public class PoiStoreService { @Autowired private RetailCompanyMapper retailCompanyMapper; @Autowired + private IPmnActivityInstanceService pmnActivityInstanceService; + @Autowired private IPmnActivityStoreRelationService storeRelationService; /** diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index d24446c..1469531 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -1424,7 +1424,7 @@ public class StoreEmployeeService { PrivilageUserDO us = new PrivilageUserDO(); us.setName(shop.getName()); - us.setMobile(poiStoreStaffVO.getMobil()); + us.setMobil(poiStoreStaffVO.getMobil()); us.setEmail(""); us.setAddress(""); us.setStatus(1); diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java index 7ad60bc..9599ab5 100644 --- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java +++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java @@ -41,7 +41,7 @@ public class PrivilageUserDO implements Serializable { /** * 电话 */ - private String mobile; + private String mobil; /** * 邮箱 diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java index 0bae9eb..de9f4a3 100644 --- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java @@ -267,7 +267,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl mobileUserQw = new QueryWrapper<>(); mobileUserQw.eq("mobil", mobil).eq("status", "1"); List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); - if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) { + if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) { return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType(); } @@ -286,7 +286,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl Date: Fri, 22 May 2020 18:32:58 +0800 Subject: [PATCH 26/34] 1 --- .../com/kiisoo/ic/customer/CustomerService.java | 10 ++++++++++ .../controller/SynchronousController.java | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 7c305fa..76a4b45 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -1,6 +1,7 @@ package com.kiisoo.ic.customer; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -116,6 +117,15 @@ public class CustomerService { @Autowired private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService; + @Autowired + private StoreEmployeeService storeEmployeeService; + @Autowired + private IPmnPromotionSrcService pmnPromotionSrcService; + @Autowired + private IPmnActivityInstanceService pmnActivityInstanceService; + @Autowired + private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService; + @Autowired private StoreEmployeeService storeEmployeeService; @Autowired 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 bf9c76a..ea07524 100644 --- a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java +++ b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java @@ -96,6 +96,21 @@ public class SynchronousController { return DataImportUtil.fail(e); } } + @RequestMapping(value = "/ics/activity/event/cb", method = RequestMethod.POST, consumes = "application/json") + @ResponseBody + public String activityEventCb(@RequestBody List turnBackDTOS) { + try { + for (TurnBackDTO turnBackDTO : turnBackDTOS) { + customerService.turnBack(turnBackDTO); + } + return DataImportUtil.succ(1); + }catch (Exception e){ + log.error("扫码回调报错",e); + String str = JSON.toJSONString(turnBackDTOS); + System.out.println(str); + return DataImportUtil.fail(e); + } + } /** * 好友查询接口 * @param friendExistReqDO 亲故对象 From 2472ba8088e3c7ab88d3011fabde5b00e2558db7 Mon Sep 17 00:00:00 2001 From: zyy Date: Sat, 23 May 2020 09:56:02 +0800 Subject: [PATCH 27/34] =?UTF-8?q?=E5=AF=BC=E8=B4=AD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kiisoo/ic/store/service/StoreEmployeeService.java | 2 +- .../java/com/kiisoo/ic/system/entity/PrivilageUserDO.java | 2 +- .../ic/system/service/impl/PrivilageAccountServiceImpl.java | 4 ++-- .../ic/system/service/impl/PrivilageUserServiceImpl.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index 1469531..d24446c 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -1424,7 +1424,7 @@ public class StoreEmployeeService { PrivilageUserDO us = new PrivilageUserDO(); us.setName(shop.getName()); - us.setMobil(poiStoreStaffVO.getMobil()); + us.setMobile(poiStoreStaffVO.getMobil()); us.setEmail(""); us.setAddress(""); us.setStatus(1); diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java index 9599ab5..7ad60bc 100644 --- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java +++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java @@ -41,7 +41,7 @@ public class PrivilageUserDO implements Serializable { /** * 电话 */ - private String mobil; + private String mobile; /** * 邮箱 diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java index de9f4a3..0bae9eb 100644 --- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java @@ -267,7 +267,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl mobileUserQw = new QueryWrapper<>(); mobileUserQw.eq("mobil", mobil).eq("status", "1"); List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); - if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) { + if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) { return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType(); } @@ -286,7 +286,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl Date: Mon, 25 May 2020 16:43:13 +0800 Subject: [PATCH 28/34] swagger mysql --- src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java | 2 ++ src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java index 05a4153..2b18c30 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java @@ -36,6 +36,8 @@ public class PromotionSrcVO { private PoiStore store; + private PoiStore store; + private Long caseId; private Long status; diff --git a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java index 68664e6..92a64ce 100644 --- a/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java +++ b/src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java @@ -6,6 +6,7 @@ import com.kiisoo.ic.activity.entity.PmnActivityInstance; import com.kiisoo.ic.activity.entity.PmnActivityStoreRelation; import com.kiisoo.ic.activity.service.IPmnActivityInstanceService; import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kiisoo.ic.customer.service.CustomerViewService; import com.kiisoo.ic.domain.entity.PrivilageDomainEntityDO; import com.kiisoo.ic.domain.mapper.PrivilageDomainEntityDOMapper; From 3d2a46e8794537360270ad2be070e31998d6b12f Mon Sep 17 00:00:00 2001 From: zhenghuang <236220500@qq.com> Date: Fri, 29 May 2020 15:53:47 +0800 Subject: [PATCH 29/34] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8,=E6=AC=A2?= =?UTF-8?q?=E8=BF=8E=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PmnActivityInstanceServiceImpl.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java index f8a87be..9f62f73 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java @@ -393,4 +393,53 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpllambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2)); } } + + @Transactional + @Override + public void scanValidAndSet() { + Date now = new Date(); + List starts = pmnActivityInstanceService.list(Wrappers.lambdaQuery().eq(PmnActivityInstance::getStatus, 1).le(PmnActivityInstance::getBeginTime, now).ge(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId)); + if(starts.size() > 0) { + starts.stream().forEach(item -> item.setStatus(2L)); + Set startInstances = starts.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet()); + pmnActivityInstanceService.updateBatchById(starts); + PmnPromotionSrc startPromotionSrc = new PmnPromotionSrc(); + startPromotionSrc.setStatus(1L); + PmnActivityInstanceConfig startConfig = new PmnActivityInstanceConfig(); + startConfig.setStatus(1L); + PmnActivityStoreRelation startStoreRelation = new PmnActivityStoreRelation(); + startStoreRelation.setStatus(1); + PmnActivityPromotionCase startCase = new PmnActivityPromotionCase(); + startCase.setStatus(1L); + pmnPromotionSrcService.update(startPromotionSrc, Wrappers.lambdaQuery().in(PmnPromotionSrc::getInstanceId, startInstances).ne(PmnPromotionSrc::getStatus, 1)); + pmnActivityInstanceConfigService.update(startConfig, Wrappers.lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, startInstances).ne(PmnActivityInstanceConfig::getStatus, 1)); + pmnActivityStoreRelationService.update(startStoreRelation, Wrappers.lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, startInstances).ne(PmnActivityStoreRelation::getStatus, 1)); + pmnActivityPromotionCaseService.update(startCase, Wrappers.lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, startInstances).ne(PmnActivityPromotionCase::getStatus, 1)); + log.info("starts: {}", starts); + } + } + + @Transactional + @Override + public void scanInvalidAndSer() { + Date now = new Date(); + List ends = pmnActivityInstanceService.list(Wrappers.lambdaQuery().ne(PmnActivityInstance::getStatus, 3).ne(PmnActivityInstance::getStatus, 4).le(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId)); + if(ends.size() > 0) { + ends.stream().forEach(item -> item.setStatus(3L)); + Set endInstances = ends.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet()); + pmnActivityInstanceService.updateBatchById(ends); + PmnPromotionSrc endPromotionSrc = new PmnPromotionSrc(); + endPromotionSrc.setStatus(2L); + PmnActivityInstanceConfig endConfig = new PmnActivityInstanceConfig(); + endConfig.setStatus(2L); + PmnActivityStoreRelation endStoreRelation = new PmnActivityStoreRelation(); + endStoreRelation.setStatus(2); + PmnActivityPromotionCase endCase = new PmnActivityPromotionCase(); + endCase.setStatus(2L); + pmnPromotionSrcService.update(endPromotionSrc, Wrappers.lambdaQuery().in(PmnPromotionSrc::getInstanceId, endInstances).ne(PmnPromotionSrc::getStatus, 2)); + pmnActivityInstanceConfigService.update(endConfig, Wrappers.lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, endInstances).ne(PmnActivityInstanceConfig::getStatus, 2)); + pmnActivityStoreRelationService.update(endStoreRelation, Wrappers.lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, endInstances).ne(PmnActivityStoreRelation::getStatus, 2)); + pmnActivityPromotionCaseService.update(endCase, Wrappers.lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2)); + } + } } From 8d49d4ac5db20223c4161993f34ccb39cbbf85e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Sun, 31 May 2020 15:04:06 +0800 Subject: [PATCH 30/34] 1 --- .../com/kiisoo/ic/customer/CustomerService.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index 76a4b45..a46019c 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -114,17 +114,6 @@ public class CustomerService { private IPmnPromotionSrcService pmnPromotionSrcService; @Autowired private IPmnActivityInstanceService pmnActivityInstanceService; - @Autowired - private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService; - - @Autowired - private StoreEmployeeService storeEmployeeService; - @Autowired - private IPmnPromotionSrcService pmnPromotionSrcService; - @Autowired - private IPmnActivityInstanceService pmnActivityInstanceService; - @Autowired - private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService; @Autowired private StoreEmployeeService storeEmployeeService; @@ -132,6 +121,9 @@ public class CustomerService { private IPmnActivityStoreRelationService pmnActivityStoreRelationService; @Autowired private IPmnPromotionFriendsSrcService pmnPromotionFriendsSrcService; + @Autowired + private RedisUtil redisUtil; + /** * token */ From 9c988e157cc266c5671be0616fa2748aec8eb385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Fri, 22 May 2020 18:32:58 +0800 Subject: [PATCH 31/34] 1 --- src/main/java/com/kiisoo/ic/customer/CustomerService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index a46019c..d872cc6 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -116,9 +116,8 @@ public class CustomerService { private IPmnActivityInstanceService pmnActivityInstanceService; @Autowired - private StoreEmployeeService storeEmployeeService; - @Autowired - private IPmnActivityStoreRelationService pmnActivityStoreRelationService; + private IPmnPromotionSrcService pmnPromotionSrcService; + @Autowired private IPmnPromotionFriendsSrcService pmnPromotionFriendsSrcService; @Autowired From 401d05a061f959325bd9709fd4b39c933f0d3860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Sun, 31 May 2020 15:04:06 +0800 Subject: [PATCH 32/34] 1 --- src/main/java/com/kiisoo/ic/customer/CustomerService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index d872cc6..c926808 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -118,6 +118,10 @@ public class CustomerService { @Autowired private IPmnPromotionSrcService pmnPromotionSrcService; + @Autowired + private StoreEmployeeService storeEmployeeService; + @Autowired + private IPmnActivityStoreRelationService pmnActivityStoreRelationService; @Autowired private IPmnPromotionFriendsSrcService pmnPromotionFriendsSrcService; @Autowired From 3b66d7254688e8e3375a64bf5efea294738e98c3 Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Mon, 1 Jun 2020 16:38:45 +0800 Subject: [PATCH 33/34] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic/activity/bean/PromotionSrcVO.java | 2 - .../impl/PmnActivityInstanceServiceImpl.java | 49 ------------------- .../kiisoo/ic/customer/CustomerService.java | 3 -- .../store/service/StoreEmployeeService.java | 2 +- .../controller/SynchronousController.java | 15 ------ .../ic/system/entity/PrivilageUserDO.java | 2 +- .../impl/PrivilageAccountServiceImpl.java | 4 +- .../impl/PrivilageUserServiceImpl.java | 2 +- 8 files changed, 5 insertions(+), 74 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java index 2b18c30..05a4153 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java @@ -36,8 +36,6 @@ public class PromotionSrcVO { private PoiStore store; - private PoiStore store; - private Long caseId; private Long status; diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java index 9f62f73..f8a87be 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java @@ -393,53 +393,4 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpllambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2)); } } - - @Transactional - @Override - public void scanValidAndSet() { - Date now = new Date(); - List starts = pmnActivityInstanceService.list(Wrappers.lambdaQuery().eq(PmnActivityInstance::getStatus, 1).le(PmnActivityInstance::getBeginTime, now).ge(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId)); - if(starts.size() > 0) { - starts.stream().forEach(item -> item.setStatus(2L)); - Set startInstances = starts.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet()); - pmnActivityInstanceService.updateBatchById(starts); - PmnPromotionSrc startPromotionSrc = new PmnPromotionSrc(); - startPromotionSrc.setStatus(1L); - PmnActivityInstanceConfig startConfig = new PmnActivityInstanceConfig(); - startConfig.setStatus(1L); - PmnActivityStoreRelation startStoreRelation = new PmnActivityStoreRelation(); - startStoreRelation.setStatus(1); - PmnActivityPromotionCase startCase = new PmnActivityPromotionCase(); - startCase.setStatus(1L); - pmnPromotionSrcService.update(startPromotionSrc, Wrappers.lambdaQuery().in(PmnPromotionSrc::getInstanceId, startInstances).ne(PmnPromotionSrc::getStatus, 1)); - pmnActivityInstanceConfigService.update(startConfig, Wrappers.lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, startInstances).ne(PmnActivityInstanceConfig::getStatus, 1)); - pmnActivityStoreRelationService.update(startStoreRelation, Wrappers.lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, startInstances).ne(PmnActivityStoreRelation::getStatus, 1)); - pmnActivityPromotionCaseService.update(startCase, Wrappers.lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, startInstances).ne(PmnActivityPromotionCase::getStatus, 1)); - log.info("starts: {}", starts); - } - } - - @Transactional - @Override - public void scanInvalidAndSer() { - Date now = new Date(); - List ends = pmnActivityInstanceService.list(Wrappers.lambdaQuery().ne(PmnActivityInstance::getStatus, 3).ne(PmnActivityInstance::getStatus, 4).le(PmnActivityInstance::getEndTime, now).select(PmnActivityInstance::getId)); - if(ends.size() > 0) { - ends.stream().forEach(item -> item.setStatus(3L)); - Set endInstances = ends.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet()); - pmnActivityInstanceService.updateBatchById(ends); - PmnPromotionSrc endPromotionSrc = new PmnPromotionSrc(); - endPromotionSrc.setStatus(2L); - PmnActivityInstanceConfig endConfig = new PmnActivityInstanceConfig(); - endConfig.setStatus(2L); - PmnActivityStoreRelation endStoreRelation = new PmnActivityStoreRelation(); - endStoreRelation.setStatus(2); - PmnActivityPromotionCase endCase = new PmnActivityPromotionCase(); - endCase.setStatus(2L); - pmnPromotionSrcService.update(endPromotionSrc, Wrappers.lambdaQuery().in(PmnPromotionSrc::getInstanceId, endInstances).ne(PmnPromotionSrc::getStatus, 2)); - pmnActivityInstanceConfigService.update(endConfig, Wrappers.lambdaQuery().in(PmnActivityInstanceConfig::getInstanceId, endInstances).ne(PmnActivityInstanceConfig::getStatus, 2)); - pmnActivityStoreRelationService.update(endStoreRelation, Wrappers.lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, endInstances).ne(PmnActivityStoreRelation::getStatus, 2)); - pmnActivityPromotionCaseService.update(endCase, Wrappers.lambdaQuery().in(PmnActivityPromotionCase::getInstanceId, endInstances).ne(PmnActivityPromotionCase::getStatus, 2)); - } - } } diff --git a/src/main/java/com/kiisoo/ic/customer/CustomerService.java b/src/main/java/com/kiisoo/ic/customer/CustomerService.java index c926808..a46019c 100644 --- a/src/main/java/com/kiisoo/ic/customer/CustomerService.java +++ b/src/main/java/com/kiisoo/ic/customer/CustomerService.java @@ -115,9 +115,6 @@ public class CustomerService { @Autowired private IPmnActivityInstanceService pmnActivityInstanceService; - @Autowired - private IPmnPromotionSrcService pmnPromotionSrcService; - @Autowired private StoreEmployeeService storeEmployeeService; @Autowired diff --git a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java index d24446c..1469531 100644 --- a/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java +++ b/src/main/java/com/kiisoo/ic/store/service/StoreEmployeeService.java @@ -1424,7 +1424,7 @@ public class StoreEmployeeService { PrivilageUserDO us = new PrivilageUserDO(); us.setName(shop.getName()); - us.setMobile(poiStoreStaffVO.getMobil()); + us.setMobil(poiStoreStaffVO.getMobil()); us.setEmail(""); us.setAddress(""); us.setStatus(1); 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 ea07524..c7fa10b 100644 --- a/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java +++ b/src/main/java/com/kiisoo/ic/synchronous/controller/SynchronousController.java @@ -130,21 +130,6 @@ public class SynchronousController { return bsdFriendsExistResponse; } } - @RequestMapping(value = "/ics/activity/event/cb", method = RequestMethod.POST, consumes = "application/json") - @ResponseBody - public String activityEventCb(@RequestBody List turnBackDTOS) { - try { - for (TurnBackDTO turnBackDTO : turnBackDTOS) { - customerService.turnBack(turnBackDTO); - } - return DataImportUtil.succ(1); - }catch (Exception e){ - log.error("扫码回调报错",e); - String str = JSON.toJSONString(turnBackDTOS); - System.out.println(str); - return DataImportUtil.fail(e); - } - } /** * 好友添加回调通知 diff --git a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java index 7ad60bc..9599ab5 100644 --- a/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java +++ b/src/main/java/com/kiisoo/ic/system/entity/PrivilageUserDO.java @@ -41,7 +41,7 @@ public class PrivilageUserDO implements Serializable { /** * 电话 */ - private String mobile; + private String mobil; /** * 邮箱 diff --git a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java index 0bae9eb..de9f4a3 100644 --- a/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/system/service/impl/PrivilageAccountServiceImpl.java @@ -267,7 +267,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl mobileUserQw = new QueryWrapper<>(); mobileUserQw.eq("mobil", mobil).eq("status", "1"); List mobileUsers = privilageUserDOMapper.selectList(mobileUserQw); - if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobile().equals(mobil)) { + if (CollectionUtils.isNotEmpty(mobileUsers) && !oldUser.getMobil().equals(mobil)) { return AccountEnum.ACCOUNT_MODIFY_STATUS_MOBILE_EXISTS.getType(); } @@ -286,7 +286,7 @@ public class PrivilageAccountServiceImpl extends ServiceImpl Date: Mon, 1 Jun 2020 23:58:09 +0800 Subject: [PATCH 34/34] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88?= =?UTF-8?q?=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pom.xml b/pom.xml index b999711..ffbddd5 100644 --- a/pom.xml +++ b/pom.xml @@ -38,13 +38,6 @@ - - org.apache.maven.plugins - maven-war-plugin - 3.0.0 - - - org.projectlombok lombok @@ -256,18 +249,6 @@ 2.5.1 - - - org.apache.poi - poi - 3.16 - - - org.apache.poi - poi-ooxml - 3.16 - - org.apache.shiro shiro-spring