diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java index c30f5e2c4..11febb231 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java @@ -4,6 +4,7 @@ import com.stdiet.common.annotation.Log; import com.stdiet.common.core.controller.BaseController; import com.stdiet.common.core.domain.AjaxResult; import com.stdiet.common.core.domain.entity.SysUser; +import com.stdiet.common.core.domain.model.LoginUser; import com.stdiet.common.core.page.TableDataInfo; import com.stdiet.common.enums.BusinessType; import com.stdiet.common.utils.SecurityUtils; @@ -74,6 +75,11 @@ public class SysCustomerController extends BaseController { } } startPage(); + //限制客户档案权限，暂时先不放开 + /*LoginUser loginUser = SecurityUtils.getLoginUser(); + if(!SecurityUtils.isManager(loginUser)){ + sysCustomer.setLoginUserId(loginUser.getUser().getUserId()); + }*/ list = sysCustomerService.selectSysCustomerList(sysCustomer); if (list != null && list.size() > 0) { for (SysCustomer sysCus : list) { diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java index 931e94bc5..2824ce842 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; import com.stdiet.common.annotation.Log; import com.stdiet.common.core.domain.AjaxResult; import com.stdiet.common.core.domain.entity.SysUser; +import com.stdiet.common.core.domain.model.LoginUser; import com.stdiet.common.enums.BusinessType; import com.stdiet.common.utils.SecurityUtils; import com.stdiet.common.utils.StringUtils; @@ -59,7 +60,12 @@ public class SysOrderController extends OrderBaseController { sysOrder.setAccRange(remark.split("\\|")); } } - + //限制订单权限，暂时先不放开 + /*LoginUser loginUser = SecurityUtils.getLoginUser(); + if(!SecurityUtils.isManager(loginUser)){ + System.out.println(loginUser.getUser().getUserId() + "-------------------------"); + sysOrder.setLoginUserId(loginUser.getUser().getUserId()); + }*/ list = sysOrderService.selectSysOrderList(sysOrder); List userList = userService.selectAllUser(); BigDecimal totalAmount = sysOrderService.selectAllOrderAmount(sysOrder); diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxBannerImageController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxBannerImageController.java new file mode 100644 index 000000000..cee1effc7 --- /dev/null +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxBannerImageController.java @@ -0,0 +1,103 @@ +package com.stdiet.custom.controller; + +import java.util.List; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.stdiet.common.annotation.Log; +import com.stdiet.common.core.controller.BaseController; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.enums.BusinessType; +import com.stdiet.custom.domain.SysWxBannerImage; +import com.stdiet.custom.service.ISysWxBannerImageService; +import com.stdiet.common.utils.poi.ExcelUtil; +import com.stdiet.common.core.page.TableDataInfo; + +/** + * 小程序banner图Controller + * + * @author xzj + * @date 2021-07-13 + */ +@RestController +@RequestMapping("/custom/wxBannerImage") +public class SysWxBannerImageController extends BaseController +{ + @Autowired + private ISysWxBannerImageService sysWxBannerImageService; + + /** + * 查询小程序banner图列表 + */ + @PreAuthorize("@ss.hasPermi('custom:wxBannerImage:list')") + @GetMapping("/list") + public TableDataInfo list(SysWxBannerImage sysWxBannerImage) + { + startPage(); + List list = sysWxBannerImageService.selectSysWxBannerImageList(sysWxBannerImage); + return getDataTable(list); + } + + /** + * 导出小程序banner图列表 + */ + @PreAuthorize("@ss.hasPermi('custom:wxBannerImage:export')") + @Log(title = "小程序banner图", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(SysWxBannerImage sysWxBannerImage) + { + List list = sysWxBannerImageService.selectSysWxBannerImageList(sysWxBannerImage); + ExcelUtil util = new ExcelUtil(SysWxBannerImage.class); + return util.exportExcel(list, "wxBannerImage"); + } + + /** + * 获取小程序banner图详细信息 + */ + @PreAuthorize("@ss.hasPermi('custom:wxBannerImage:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(sysWxBannerImageService.selectSysWxBannerImageById(id)); + } + + /** + * 新增小程序banner图 + */ + @PreAuthorize("@ss.hasPermi('custom:wxBannerImage:add')") + @Log(title = "小程序banner图", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SysWxBannerImage sysWxBannerImage) + { + return toAjax(sysWxBannerImageService.insertSysWxBannerImage(sysWxBannerImage)); + } + + /** + * 修改小程序banner图 + */ + @PreAuthorize("@ss.hasPermi('custom:wxBannerImage:edit')") + @Log(title = "小程序banner图", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SysWxBannerImage sysWxBannerImage) + { + return toAjax(sysWxBannerImageService.updateSysWxBannerImage(sysWxBannerImage)); + } + + /** + * 删除小程序banner图 + */ + @PreAuthorize("@ss.hasPermi('custom:wxBannerImage:remove')") + @Log(title = "小程序banner图", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(sysWxBannerImageService.deleteSysWxBannerImageByIds(ids)); + } +} \ No newline at end of file diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index 178c563c3..736ed3450 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -15,10 +15,7 @@ import com.stdiet.common.utils.file.MimeTypeUtils; import com.stdiet.common.utils.oss.AliyunOSSUtils; import com.stdiet.common.utils.sign.AesUtils; import com.stdiet.custom.domain.*; -import com.stdiet.custom.dto.response.CustomerCaseResponse; -import com.stdiet.custom.dto.response.MessageNoticeResponse; -import com.stdiet.custom.dto.response.NutritionQuestionResponse; -import com.stdiet.custom.dto.response.NutritionalVideoResponse; +import com.stdiet.custom.dto.response.*; import com.stdiet.custom.page.WxLogInfo; import com.stdiet.custom.service.*; import com.stdiet.system.service.ISysDictTypeService; @@ -75,6 +72,9 @@ public class WechatAppletController extends BaseController { @Autowired private ISysVideoClassifyService sysVideoClassifyService; + @Autowired + private ISysWxBannerImageService sysWxBannerImageService; + /** * 查询微信小程序中展示的客户案例 */ @@ -745,7 +745,7 @@ public class WechatAppletController extends BaseController { * @param openid * @return */ - @GetMapping("/getVideoClassify") + /*@GetMapping("/getVideoClassify") public AjaxResult getVideoClassify(@RequestParam("openid")String openid) { SysVideoClassify param = new SysVideoClassify(); param.setParentId(0L); @@ -776,6 +776,87 @@ public class WechatAppletController extends BaseController { } } return AjaxResult.success(result); + }*/ + + + /** + * 查询打卡社区 + * @return + */ + @GetMapping("/getCommunityPunch") + public TableDataInfo getCommunityPunch() { + startPage(); + List list = sysWxUserLogService.getCommunityPunch(new SysWxUserLog()); + return getDataTable(list); + } + + /** + * 修改健康减脂宣言 + * @return + */ + @PostMapping("/updateHealthManifesto") + public AjaxResult updateHealthManifesto(@RequestParam("cusId")String cusId, @RequestParam("healthManifesto")String healthManifesto) { + if(StringUtils.isEmpty(healthManifesto,cusId)){ + return AjaxResult.error("缺少必要参数"); + } + cusId = AesUtils.decrypt(cusId); + if(cusId == null){ + return AjaxResult.error("参数不合法"); + } + if(healthManifesto.length() > 200){ + return AjaxResult.error("健康宣言字数过长"); + } + SysWxUserInfo sysWxUserInfo = new SysWxUserInfo(); + sysWxUserInfo.setCusId(Long.parseLong(cusId)); + sysWxUserInfo.setHealthManifesto(healthManifesto); + return toAjax(sysWxUserInfoService.updateHealthManifestoByCusId(sysWxUserInfo)); + } + + /** + * 获取个人中心数据（健康宣言、消息条数、打卡社区总打卡次数、打卡次数） + * @return + */ + @GetMapping("/getCustomerCenterInfo") + public AjaxResult getCustomerCenterInfo(@RequestParam("cusId")String cusId) { + if(StringUtils.isEmpty(cusId)){ + return AjaxResult.error("缺少必要参数"); + } + cusId = AesUtils.decrypt(cusId); + if(cusId == null){ + return AjaxResult.error("参数不合法"); + } + AjaxResult result = AjaxResult.success(); + //获取健康宣言 + SysWxUserInfo sysWxUserInfo = sysWxUserInfoService.selectSysWxUserInfoByCusId(Long.parseLong(cusId)); + result.put("healthManifesto",sysWxUserInfo.getHealthManifesto() == null ? "" : sysWxUserInfo.getHealthManifesto()); + //获取未读消息条数 + SysMessageNotice messageParam = new SysMessageNotice(); + messageParam.setReadType(0); + messageParam.setMessageCustomer(Long.parseLong(cusId)); + int unReadNoticeTotal = sysMessageNoticeService.getCustomerMessageCount(messageParam); + result.put("unReadNoticeTotal", unReadNoticeTotal); + //获取已打卡几次 + SysWxUserLog sysWxUserLog = new SysWxUserLog(); + sysWxUserLog.setCustomerId(Long.parseLong(cusId)); + int punchNum = sysWxUserLogService.getPunchTotalNum(sysWxUserLog); + result.put("customerPunchNum", unReadNoticeTotal); + //查询社区打卡客户数量 + int punchCustomerNum = sysWxUserLogService.getPunchCustomerTotalNum(); + result.put("punchCustomerNum", punchCustomerNum); + return result; + } + + /** + * 获取需要在小程序展示的Banner图 + * @return + */ + @GetMapping("/getShowBannerImage") + public AjaxResult getShowBannerImage() { + SysWxBannerImage sysWxBannerImage = new SysWxBannerImage(); + //获取可以显示的Banner + sysWxBannerImage.setShowFlag(1L); + List list = sysWxBannerImageService.getBannerListOrderByOrderNum(sysWxBannerImage); + return AjaxResult.success(list); } } diff --git a/stdiet-common/src/main/java/com/stdiet/common/utils/SecurityUtils.java b/stdiet-common/src/main/java/com/stdiet/common/utils/SecurityUtils.java index 243835212..060dd9545 100644 --- a/stdiet-common/src/main/java/com/stdiet/common/utils/SecurityUtils.java +++ b/stdiet-common/src/main/java/com/stdiet/common/utils/SecurityUtils.java @@ -1,5 +1,7 @@ package com.stdiet.common.utils; +import com.stdiet.common.core.domain.entity.SysRole; +import com.stdiet.common.core.domain.entity.SysUser; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -7,6 +9,9 @@ import com.stdiet.common.constant.HttpStatus; import com.stdiet.common.core.domain.model.LoginUser; import com.stdiet.common.exception.CustomException; +import javax.management.relation.Role; +import java.util.List; + /** * 安全服务工具类 * @@ -14,6 +19,8 @@ import com.stdiet.common.exception.CustomException; */ public class SecurityUtils { + public static final String[] managerRolePower = {"after_sale_manager","operations","personnel","sales_manager","admin","manager","admin-dev"}; + /** * 获取用户账户 **/ @@ -87,4 +94,32 @@ public class SecurityUtils { return userId != null && 1L == userId; } + + /** + * 判断是否为管理人员 + */ + public static boolean isManager(LoginUser loginUser) + { + try + { + if(loginUser != null && loginUser.getUser() != null){ + SysUser user = loginUser.getUser(); + List roleList = user.getRoles(); + if(roleList != null && roleList.size() > 0){ + for (SysRole role : roleList) { + for (String power : managerRolePower) { + if(power.equals(role.getRoleKey())){ + return true; + } + } + } + } + } + } + catch (Exception e) + { + throw new CustomException("操作异常", HttpStatus.UNAUTHORIZED); + } + return false; + } } diff --git a/stdiet-common/src/main/java/com/stdiet/common/utils/StringUtils.java b/stdiet-common/src/main/java/com/stdiet/common/utils/StringUtils.java index 7781903b9..1235ab2c3 100644 --- a/stdiet-common/src/main/java/com/stdiet/common/utils/StringUtils.java +++ b/stdiet-common/src/main/java/com/stdiet/common/utils/StringUtils.java @@ -102,6 +102,21 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return isNull(str) || NULLSTR.equals(str.trim()); } + /** + * * 判断多个字符串是否为空，一个为空则返回true + * + * @param str String + * @return true：为空 false：非空 + */ + public static boolean isEmpty(String ... str) { + for (String value : str) { + if(isEmpty(value)){ + return true; + } + } + return false; + } + /** * * 判断一个字符串是否为非空串 * diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java index a29e915ad..f5ae176ab 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java @@ -93,6 +93,9 @@ public class SysCustomer extends BaseEntity private Long salesman; + //售中 + private Long onSaleId; + /** 负责人 */ @Excel(name = "负责人") private Long chargePerson; @@ -118,4 +121,6 @@ public class SysCustomer extends BaseEntity //病史体征ID private String physicalSignsId; + private Long loginUserId; + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java index c0761bf0b..5c206c66c 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java @@ -296,4 +296,7 @@ public class SysOrder extends BaseEntity { //食谱计划是否连续上个订单 private Integer recipesPlanContinue; + //登录用户ID + private Long loginUserId; + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java index 911ef5b1d..365d10f5a 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java @@ -159,4 +159,8 @@ public class SysRecipesPlan { private Integer subSend; private Integer smsSend; + + /** 食谱计划总共几天，大于0小于等于7 */ + @Excel(name = "食谱计划总共几天，大于0小于等于7") + private Integer totalNumDay; } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxBannerImage.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxBannerImage.java new file mode 100644 index 000000000..2cbbf7a2b --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxBannerImage.java @@ -0,0 +1,47 @@ +package com.stdiet.custom.domain; + +import com.stdiet.common.annotation.Excel; +import com.stdiet.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 小程序banner图对象 sys_wx_banner_image + * + * @author xzj + * @date 2021-07-13 + */ +@Data +public class SysWxBannerImage extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** banner图标题 */ + @Excel(name = "banner图标题") + private String title; + + /** banner图内容 */ + @Excel(name = "banner图内容") + private String content; + + /** banner图片地址 */ + @Excel(name = "banner图片地址") + private String bannerUrl; + + /** 点击跳转地址 */ + @Excel(name = "点击跳转地址") + private String jumpUrl; + + /** 展示标识 0不展示 1展示 */ + @Excel(name = "展示标识 0不展示 1展示") + private Long showFlag; + + /** 顺序优先级，0-100 */ + @Excel(name = "顺序优先级，0-100") + private Long orderNum; + + /** 删除标识 0未删除 1已删除 */ + private Long delFlag; +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java index a5e9a47dc..c6e8e3a27 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxUserInfo.java @@ -74,6 +74,10 @@ public class SysWxUserInfo { @Excel(name = "国家") private String country; + /** 健康宣言 */ + @Excel(name = "健康宣言") + private String healthManifesto; + private Date createTime; private String createBy; diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/BannerResponse.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/BannerResponse.java new file mode 100644 index 000000000..14ae1bd07 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/BannerResponse.java @@ -0,0 +1,28 @@ +package com.stdiet.custom.dto.response; + +import com.stdiet.common.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class BannerResponse implements Serializable { + + private static final long serialVersionUID = 1L; + + /** banner图标题 */ + @Excel(name = "banner图标题") + private String title; + + /** banner图内容 */ + @Excel(name = "banner图内容") + private String content; + + /** banner图片地址 */ + @Excel(name = "banner图片地址") + private String bannerUrl; + + /** 点击跳转地址 */ + @Excel(name = "点击跳转地址") + private String jumpUrl; +} diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java index f16c3d8fe..8eec9b950 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CommunityPunchReponse.java @@ -1,5 +1,6 @@ package com.stdiet.custom.dto.response; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.math.BigDecimal; @@ -36,6 +37,7 @@ public class CommunityPunchReponse { /** * 打卡日期时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date logTime; /** @@ -51,7 +53,7 @@ public class CommunityPunchReponse { /** * 点赞数 */ - private String thumbsupNum; + private Integer thumbsupNum; /** * 健康宣言 diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxBannerImageMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxBannerImageMapper.java new file mode 100644 index 000000000..8adf1b6ae --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxBannerImageMapper.java @@ -0,0 +1,68 @@ +package com.stdiet.custom.mapper; + +import java.util.List; +import com.stdiet.custom.domain.SysWxBannerImage; +import com.stdiet.custom.dto.response.BannerResponse; + +/** + * 小程序banner图Mapper接口 + * + * @author xzj + * @date 2021-07-13 + */ +public interface SysWxBannerImageMapper +{ + /** + * 查询小程序banner图 + * + * @param id 小程序banner图ID + * @return 小程序banner图 + */ + public SysWxBannerImage selectSysWxBannerImageById(Long id); + + /** + * 查询小程序banner图列表 + * + * @param sysWxBannerImage 小程序banner图 + * @return 小程序banner图集合 + */ + public List selectSysWxBannerImageList(SysWxBannerImage sysWxBannerImage); + + /** + * 新增小程序banner图 + * + * @param sysWxBannerImage 小程序banner图 + * @return 结果 + */ + public int insertSysWxBannerImage(SysWxBannerImage sysWxBannerImage); + + /** + * 修改小程序banner图 + * + * @param sysWxBannerImage 小程序banner图 + * @return 结果 + */ + public int updateSysWxBannerImage(SysWxBannerImage sysWxBannerImage); + + /** + * 删除小程序banner图 + * + * @param id 小程序banner图ID + * @return 结果 + */ + public int deleteSysWxBannerImageById(Long id); + + /** + * 批量删除小程序banner图 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteSysWxBannerImageByIds(Long[] ids); + + /** + * 根据优先级排序获取banner图 + * @return + */ + List getBannerListOrderByOrderNum(SysWxBannerImage sysWxBannerImage); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java index b6fabe165..168b771bd 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserInfoMapper.java @@ -77,4 +77,11 @@ public interface SysWxUserInfoMapper * @return */ public int removeCusIdByOpenId(@Param("openid")String openid); + + /** + * 根据cusId更新健康减脂宣言 + * @param sysWxUserInfo + * @return + */ + public int updateHealthManifestoByCusId(SysWxUserInfo sysWxUserInfo); } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserLogMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserLogMapper.java index bbc21d3b9..dde05bf26 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserLogMapper.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysWxUserLogMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.stdiet.custom.domain.SysWxUserInfo; import com.stdiet.custom.domain.SysWxUserLog; +import com.stdiet.custom.dto.response.CommunityPunchReponse; import com.stdiet.custom.page.WxLogInfo; /** @@ -92,4 +93,24 @@ public interface SysWxUserLogMapper */ WxLogInfo getWxLogInfoDetailById(SysWxUserLog sysWxUserLog); + /** + * 查询打卡社区记录 + * @param sysWxUserLog + * @return + */ + List getCommunityPunch(SysWxUserLog sysWxUserLog); + + /** + * 根据打卡社区 + * @param sysWxUserLog + * @return + */ + int getPunchTotalNum(SysWxUserLog sysWxUserLog); + + /** + * 查询打卡社区总共打卡人数 + * @return + */ + int getPunchCustomerTotalNum(); + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxBannerImageService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxBannerImageService.java new file mode 100644 index 000000000..bb414fa37 --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxBannerImageService.java @@ -0,0 +1,68 @@ +package com.stdiet.custom.service; + +import java.util.List; +import com.stdiet.custom.domain.SysWxBannerImage; +import com.stdiet.custom.dto.response.BannerResponse; + +/** + * 小程序banner图Service接口 + * + * @author xzj + * @date 2021-07-13 + */ +public interface ISysWxBannerImageService +{ + /** + * 查询小程序banner图 + * + * @param id 小程序banner图ID + * @return 小程序banner图 + */ + public SysWxBannerImage selectSysWxBannerImageById(Long id); + + /** + * 查询小程序banner图列表 + * + * @param sysWxBannerImage 小程序banner图 + * @return 小程序banner图集合 + */ + public List selectSysWxBannerImageList(SysWxBannerImage sysWxBannerImage); + + /** + * 新增小程序banner图 + * + * @param sysWxBannerImage 小程序banner图 + * @return 结果 + */ + public int insertSysWxBannerImage(SysWxBannerImage sysWxBannerImage); + + /** + * 修改小程序banner图 + * + * @param sysWxBannerImage 小程序banner图 + * @return 结果 + */ + public int updateSysWxBannerImage(SysWxBannerImage sysWxBannerImage); + + /** + * 批量删除小程序banner图 + * + * @param ids 需要删除的小程序banner图ID + * @return 结果 + */ + public int deleteSysWxBannerImageByIds(Long[] ids); + + /** + * 删除小程序banner图信息 + * + * @param id 小程序banner图ID + * @return 结果 + */ + public int deleteSysWxBannerImageById(Long id); + + /** + * 根据优先级排序获取banner图 + * @return + */ + List getBannerListOrderByOrderNum(SysWxBannerImage sysWxBannerImage); +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java index 143094af7..741a77f82 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserInfoService.java @@ -77,5 +77,12 @@ public interface ISysWxUserInfoService */ public int removeCusIdByOpenId(String openid); + /** + * 根据cusId更新健康减脂宣言 + * @param sysWxUserInfo + * @return + */ + public int updateHealthManifestoByCusId(SysWxUserInfo sysWxUserInfo); + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserLogService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserLogService.java index c3b89abba..9de3c3f8b 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserLogService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxUserLogService.java @@ -4,6 +4,7 @@ import java.util.List; import com.stdiet.custom.domain.SysWxUserInfo; import com.stdiet.custom.domain.SysWxUserLog; +import com.stdiet.custom.dto.response.CommunityPunchReponse; import com.stdiet.custom.page.WxLogInfo; import org.springframework.web.multipart.MultipartFile; @@ -94,4 +95,24 @@ public interface ISysWxUserLogService */ WxLogInfo getWxLogInfoDetailById(SysWxUserLog sysWxUserLog); + /** + * 查询打卡社区记录 + * @param sysWxUserLog + * @return + */ + List getCommunityPunch(SysWxUserLog sysWxUserLog); + + /** + * 根据打卡社区 + * @param sysWxUserLog + * @return + */ + int getPunchTotalNum(SysWxUserLog sysWxUserLog); + + /** + * 查询打卡社区总共打卡人数 + * @return + */ + int getPunchCustomerTotalNum(); + } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java index c689fc0ef..99161a48c 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java @@ -191,7 +191,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { pauseParam.setCusId(sysOrder.getCusId()); List pauseList = sysOrderPauseService.getPauseListByCusIdAndOrderId(pauseParam); - List planList = generatePlan(sysOrder, DateUtils.dateToLocalDate(sysOrder.getStartTime()), DateUtils.dateToLocalDate(sysOrder.getServerEndTime()), pauseList); + List planList = generatePlan(sysOrder, DateUtils.dateToLocalDate(sysOrder.getStartTime()), DateUtils.dateToLocalDate(sysOrder.getServerEndTime()), pauseList, oldRecipesPlanList); if (oldRecipesPlanList != null && oldRecipesPlanList.size() > 0) { updateOrAddRecipesPlan(oldRecipesPlanList, planList); } else { @@ -328,13 +328,15 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { * @param pauseList 暂停列表 * @return */ - private List generatePlan(SysOrder sysOrder, LocalDate serverStartDate, LocalDate serverEndDate, List pauseList) { + private List generatePlan(SysOrder sysOrder, LocalDate serverStartDate, LocalDate serverEndDate, List pauseList, List oldRecipesPlanList) { //查询在上一个订单最后一条食谱计划 SysRecipesPlan beforeOrderLastPlan = getLastDayRecipesPlan(sysOrder.getCusId(), sysOrder.getOrderTime()); int startNumDay = 0; //System.out.println(sysOrder.getRecipesPlanContinue() == null); int totalDays = (beforeOrderLastPlan != null ? beforeOrderLastPlan.getEndNumDay() : 0) + Integer.parseInt(ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(sysOrder.getStartTime()), DateUtils.dateToLocalDate(sysOrder.getServerEndTime()))+"") + 1; //System.out.println(totalDays); + //每条食谱计划日期相差的天数 + int totalNumDay = 6; //之前是否存在食谱以及该订单食谱计划是否需要连续 if (beforeOrderLastPlan != null && sysOrder.getRecipesPlanContinue().intValue() == 1) { long differDay = ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()), serverStartDate); @@ -342,21 +344,14 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { if (differDay <= 1) { //判断前一个订单食谱是否满七天，不满则需要接上 int differNum = beforeOrderLastPlan.getEndNumDay() - beforeOrderLastPlan.getStartNumDay(); - if (differNum < 6) { + totalNumDay = beforeOrderLastPlan.getTotalNumDay() - 1; + if (differNum != totalNumDay) { //更新该食谱计划 - beforeOrderLastPlan.setEndNumDay(beforeOrderLastPlan.getStartNumDay() + 6); - // - String[] pauseResult = dealPlanPause(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(1), DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(6-differNum), pauseList); + beforeOrderLastPlan.setEndNumDay(beforeOrderLastPlan.getStartNumDay() + totalNumDay); + String[] pauseResult = dealPlanPause(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(1), DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(totalNumDay-differNum), pauseList, totalNumDay); //LocalDate planStartDate = DateUtils.stringToLocalDate(pauseResult[0], "yyyyMMdd"); LocalDate planEndDate = DateUtils.stringToLocalDate(pauseResult[1], "yyyyMMdd"); beforeOrderLastPlan.setEndDate(DateUtils.localDateToDate(planEndDate)); - - //beforeOrderLastPlan.setEndDate(DateUtils.localDateToDate(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(6 - differNum))); - // - /*String[] pauseResult = dealPlanPause(DateUtils.dateToLocalDate(beforeOrderLastPlan.getStartDate()), DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()), pauseList); - //LocalDate planStartDate = DateUtils.stringToLocalDate(pauseResult[0], "yyyyMMdd"); - LocalDate planEndDate = DateUtils.stringToLocalDate(pauseResult[1], "yyyyMMdd"); - beforeOrderLastPlan.setEndDate(DateUtils.localDateToDate(planEndDate));*/ sysRecipesPlanMapper.updateSysRecipesPlan(beforeOrderLastPlan); serverStartDate = DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()).plusDays(1); } @@ -368,15 +363,17 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { LocalDate planStartDate = null; LocalDate planEndDate = serverStartDate.plusDays(-1); boolean breakFlag = true; + Map totalDayNumMap = getOldEveryPlanTotalNumDay(oldRecipesPlanList); do { + totalNumDay = totalDayNumMap.containsKey(startNumDay+1+"") ? totalDayNumMap.get(startNumDay+1+"") : 6; SysRecipesPlan sysRecipesPlan = new SysRecipesPlan(); planStartDate = planEndDate.plusDays(1); - planEndDate = planStartDate.plusDays(6); + planEndDate = planStartDate.plusDays(totalNumDay); //判断是否大于服务到期时间 if (ChronoUnit.DAYS.between(planEndDate, serverEndDate) <= 0) { planEndDate = serverEndDate; } - String[] pauseResult = dealPlanPause(planStartDate, planEndDate, pauseList); + String[] pauseResult = dealPlanPause(planStartDate, planEndDate, pauseList,totalNumDay); //根据暂停结果返回的数据更新计划开始、结束时间 planStartDate = DateUtils.stringToLocalDate(pauseResult[0], "yyyyMMdd"); planEndDate = DateUtils.stringToLocalDate(pauseResult[1], "yyyyMMdd"); @@ -402,7 +399,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { startNumDay += 1; sysRecipesPlan.setStartNumDay(startNumDay); long dayNumber = ChronoUnit.DAYS.between(planStartDate, planEndDate); - startNumDay += dayNumber > 6 ? 6 : dayNumber; + startNumDay += dayNumber > totalNumDay ? totalNumDay : dayNumber; sysRecipesPlan.setEndNumDay(startNumDay > totalDays ? totalDays : startNumDay);// //添加暂停范围内的日期 planList.add(sysRecipesPlan); @@ -411,6 +408,14 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { return planList; } + public Map getOldEveryPlanTotalNumDay(List oldRecipesPlanList){ + Map map = new HashMap<>(); + for (SysRecipesPlan plan : oldRecipesPlanList) { + map.put(plan.getStartNumDay()+"", plan.getTotalNumDay()-1); + } + return map; + } + /** * 根据食谱开始时间、结束时间、暂停列表获取在食谱计划范围内的暂停天数，以及返回调整之后的计划开始、结束时间，以及暂停日期 * @@ -419,7 +424,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { * @param pauseList 暂停列表集合 * @return */ - private String[] dealPlanPause(LocalDate planStartDate, LocalDate planEndDate, List pauseList) { + private String[] dealPlanPause(LocalDate planStartDate, LocalDate planEndDate, List pauseList, int totalNumDay) { //分别为计划开始时间、计划结束时间，范围内暂停天数，具体暂停日期，使用|隔开 String[] result = {"", "", "0", ""}; long pauseDay = 0; @@ -443,7 +448,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService { //判断暂停记录是否从食谱计划开始时间开始的 if (ChronoUnit.DAYS.between(pauseStartDate, planStartDate) == 0) { planStartDate = pauseEndDate.plusDays(1); - planEndDate = planStartDate.plusDays(6); + planEndDate = planStartDate.plusDays(totalNumDay); } else { planEndDate = planEndDate.plusDays(ChronoUnit.DAYS.between(pauseStartDate, pauseEndDate) + 1); pauseDateString.addAll(getPauseDateString(pauseStartDate, pauseEndDate)); diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxBannerImageServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxBannerImageServiceImpl.java new file mode 100644 index 000000000..58b998a8b --- /dev/null +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxBannerImageServiceImpl.java @@ -0,0 +1,106 @@ +package com.stdiet.custom.service.impl; + +import java.util.List; +import com.stdiet.common.utils.DateUtils; +import com.stdiet.custom.dto.response.BannerResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.stdiet.custom.mapper.SysWxBannerImageMapper; +import com.stdiet.custom.domain.SysWxBannerImage; +import com.stdiet.custom.service.ISysWxBannerImageService; + +/** + * 小程序banner图Service业务层处理 + * + * @author xzj + * @date 2021-07-13 + */ +@Service +public class SysWxBannerImageServiceImpl implements ISysWxBannerImageService +{ + @Autowired + private SysWxBannerImageMapper sysWxBannerImageMapper; + + /** + * 查询小程序banner图 + * + * @param id 小程序banner图ID + * @return 小程序banner图 + */ + @Override + public SysWxBannerImage selectSysWxBannerImageById(Long id) + { + return sysWxBannerImageMapper.selectSysWxBannerImageById(id); + } + + /** + * 查询小程序banner图列表 + * + * @param sysWxBannerImage 小程序banner图 + * @return 小程序banner图 + */ + @Override + public List selectSysWxBannerImageList(SysWxBannerImage sysWxBannerImage) + { + return sysWxBannerImageMapper.selectSysWxBannerImageList(sysWxBannerImage); + } + + /** + * 新增小程序banner图 + * + * @param sysWxBannerImage 小程序banner图 + * @return 结果 + */ + @Override + public int insertSysWxBannerImage(SysWxBannerImage sysWxBannerImage) + { + sysWxBannerImage.setCreateTime(DateUtils.getNowDate()); + return sysWxBannerImageMapper.insertSysWxBannerImage(sysWxBannerImage); + } + + /** + * 修改小程序banner图 + * + * @param sysWxBannerImage 小程序banner图 + * @return 结果 + */ + @Override + public int updateSysWxBannerImage(SysWxBannerImage sysWxBannerImage) + { + sysWxBannerImage.setUpdateTime(DateUtils.getNowDate()); + return sysWxBannerImageMapper.updateSysWxBannerImage(sysWxBannerImage); + } + + /** + * 批量删除小程序banner图 + * + * @param ids 需要删除的小程序banner图ID + * @return 结果 + */ + @Override + public int deleteSysWxBannerImageByIds(Long[] ids) + { + return sysWxBannerImageMapper.deleteSysWxBannerImageByIds(ids); + } + + /** + * 删除小程序banner图信息 + * + * @param id 小程序banner图ID + * @return 结果 + */ + @Override + public int deleteSysWxBannerImageById(Long id) + { + return sysWxBannerImageMapper.deleteSysWxBannerImageById(id); + } + + /** + * 根据优先级排序获取banner图 + * @return + */ + @Override + public List getBannerListOrderByOrderNum(SysWxBannerImage sysWxBannerImage){ + return sysWxBannerImageMapper.getBannerListOrderByOrderNum(sysWxBannerImage); + } +} \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java index acae1d1d6..d04eece65 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserInfoServiceImpl.java @@ -115,4 +115,13 @@ public class SysWxUserInfoServiceImpl implements ISysWxUserInfoService { public int removeCusIdByOpenId(String openid){ return sysWxUserInfoMapper.removeCusIdByOpenId(openid); } + + /** + * 根据cusId更新健康减脂宣言 + * @param sysWxUserInfo + * @return + */ + public int updateHealthManifestoByCusId(SysWxUserInfo sysWxUserInfo){ + return sysWxUserInfoMapper.updateHealthManifestoByCusId(sysWxUserInfo); + } } \ No newline at end of file diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserLogServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserLogServiceImpl.java index dbe7129c7..3100965e4 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserLogServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxUserLogServiceImpl.java @@ -11,6 +11,7 @@ import com.stdiet.common.utils.oss.AliyunOSSUtils; import com.stdiet.custom.domain.SysMessageNotice; import com.stdiet.custom.domain.SysWxUserInfo; import com.stdiet.custom.domain.entityEnum.MessageNoticeEnum; +import com.stdiet.custom.dto.response.CommunityPunchReponse; import com.stdiet.custom.page.WxLogInfo; import com.stdiet.custom.service.ISysMessageNoticeService; import org.springframework.beans.factory.annotation.Autowired; @@ -145,4 +146,30 @@ public class SysWxUserLogServiceImpl implements ISysWxUserLogService { return sysWxUserLogMapper.getWxLogInfoDetailById(sysWxUserLog); } + /** + * 查询打卡社区记录 + * @param sysWxUserLog + * @return + */ + public List getCommunityPunch(SysWxUserLog sysWxUserLog){ + return sysWxUserLogMapper.getCommunityPunch(sysWxUserLog); + } + + /** + * 根据打卡社区 + * @param sysWxUserLog + * @return + */ + public int getPunchTotalNum(SysWxUserLog sysWxUserLog){ + return sysWxUserLogMapper.getPunchTotalNum(sysWxUserLog); + } + + /** + * 查询打卡社区总共打卡人数 + * @return + */ + public int getPunchCustomerTotalNum(){ + return sysWxUserLogMapper.getPunchCustomerTotalNum(); + } + } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml index 756e76742..fcde93fbb 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysCustomerMapper.xml @@ -28,6 +28,7 @@ + @@ -40,14 +41,23 @@ - select id, name, phone, email, fans_time, fans_channel, address, pay_date, start_date, purchase_num, pay_total, main_dietitian, assistant_dietitian, after_dietitian, salesman, charge_person, follow_status, create_time, create_by, update_time, update_by, channel_id from sys_customer + select id, name, phone, email, fans_time, fans_channel, address, pay_date, start_date, purchase_num, pay_total, main_dietitian, assistant_dietitian, after_dietitian, salesman, on_sale_id, charge_person, follow_status, create_time, create_by, update_time, update_by, channel_id from sys_customer + + + + + and ( + sc.main_dietitian = #{loginUserId} or sc.assistant_dietitian = #{loginUserId} or sc.after_dietitian = #{loginUserId} or sc.salesman = #{loginUserId} + or sc.on_sale_id = #{loginUserId} + ) + @@ -107,6 +121,7 @@ assistant_dietitian, after_dietitian, salesman, + on_sale_id, charge_person, follow_status, create_time, @@ -130,6 +145,7 @@ #{assistantDietitian}, #{afterDietitian}, #{salesman}, + #{onSaleId}, #{chargePerson}, #{followStatus}, #{createTime}, @@ -157,6 +173,7 @@ assistant_dietitian = #{assistantDietitian}, after_dietitian = #{afterDietitian}, salesman = #{salesman}, + on_sale_id = #{onSaleId}, charge_person = #{chargePerson}, follow_status = #{followStatus}, create_time = #{createTime}, diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index a9ffa816d..fe8aa5b08 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -95,28 +95,97 @@ + + + and ( + sc.main_dietitian = #{loginUserId} or sc.assistant_dietitian = #{loginUserId} or sc.after_dietitian = #{loginUserId} or sc.salesman = #{loginUserId} + or o.pre_sale_id = #{loginUserId} or o.on_sale_id = #{loginUserId} or o.after_sale_id = #{loginUserId} or o.nutritionist_id = #{loginUserId} or + o.nutri_assis_id = #{loginUserId} + ) + + + + + - - - SELECT srp.id,srp.order_id,sr.customer,sr.phone, srp.start_date,srp.end_date,srp.send_flag,srp.send_time + SELECT srp.id,srp.order_id,sr.customer,sr.phone, srp.start_date,srp.end_date,srp.send_flag,srp.send_time,srp.total_num_day FROM sys_recipes_plan srp LEFT JOIN sys_order sr ON sr.order_id = srp.order_id WHERE srp.del_flag = 0 AND sr.del_flag = 0 AND srp.order_id = #{orderId} diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxBannerImageMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxBannerImageMapper.xml new file mode 100644 index 000000000..b70a7d2b5 --- /dev/null +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxBannerImageMapper.xml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + select id, title, content, banner_url, jump_url, show_flag, order_num, create_time, create_by, update_time, update_by, del_flag from sys_wx_banner_image + + + + + + + + insert into sys_wx_banner_image + + title, + content, + banner_url, + jump_url, + show_flag, + order_num, + create_time, + create_by, + update_time, + update_by, + del_flag, + + + #{title}, + #{content}, + #{bannerUrl}, + #{jumpUrl}, + #{showFlag}, + #{orderNum}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{delFlag}, + + + + + update sys_wx_banner_image + + title = #{title}, + content = #{content}, + banner_url = #{bannerUrl}, + jump_url = #{jumpUrl}, + show_flag = #{showFlag}, + order_num = #{orderNum}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, + + where id = #{id} + + + + update sys_wx_banner_image set del_flag = 1 where id = #{id} + + + + update sys_wx_banner_image set del_flag = 1 where id in + + #{id} + + + + + + + \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml index 98f22abb5..a2db510d5 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml @@ -21,6 +21,7 @@ + @@ -75,6 +76,7 @@ update_time, remark, language, + health_manifesto, #{openid}, @@ -93,6 +95,7 @@ #{updateTime}, #{remark}, #{language}, + #{healthManifesto}, @@ -114,6 +117,7 @@ update_time = #{updateTime}, remark = #{remark}, language = #{language}, + health_manifesto = #{healthManifesto}, where openid = #{openid} @@ -140,4 +144,9 @@ update sys_wx_user_info set cus_id = null where openid = #{openid} + + + update sys_wx_user_info set health_manifesto = #{healthManifesto} where cus_id = #{cusId} + + \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml index f9f4b8718..770bd3fc4 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml @@ -318,17 +318,47 @@ - + + + + + + + + + + + + + - + + + + + + + + + + + \ No newline at end of file diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue index 217efab90..8174962c0 100644 --- a/stdiet-ui/src/views/custom/customer/index.vue +++ b/stdiet-ui/src/views/custom/customer/index.vue @@ -42,7 +42,7 @@ - + - + + + + + + - + - + + + + + + + + + @@ -521,6 +551,7 @@ export default { assistantDietitian: null, afterDietitian: null, salesman: null, + onSaleId: null, physicalSignsId: null, }, // 表单参数 @@ -597,6 +628,8 @@ export default { ...mapGetters([ // 售前字典 "preSaleIdOptions", + //售中 + "onSaleIdOptions", // 售后字典 "afterSaleIdOptions", // 主营养师字典 @@ -623,6 +656,10 @@ export default { preSaleIdFormat(row, column) { return this.selectDictLabel(this.preSaleIdOptions, row.salesman); }, + // 售中字典翻译 + onSaleIdFormat(row, column) { + return this.selectDictLabel(this.onSaleIdOptions, row.onSaleId); + }, // 售后字典翻译 afterSaleIdFormat(row, column) { return this.selectDictLabel(this.afterSaleIdOptions, row.afterDietitian); @@ -691,6 +728,7 @@ export default { assistantDietitian: null, afterDietitian: null, salesman: null, + onSaleId: null, chargePerson: null, fansChannel: 0, fansTime: null,