diff --git a/hai-cweb/src/main/java/com/cweb/controller/BsMsgController.java b/hai-cweb/src/main/java/com/cweb/controller/BsMsgController.java index 5e47fe29..f225b8f3 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/BsMsgController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/BsMsgController.java @@ -89,10 +89,52 @@ public class BsMsgController { SessionObject sessionObject = userCenter.getSessionObject(request); HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); + bsMsgService.checkMsg(userInfoModel.getHighUser(), msgId); + return ResponseMsgUtil.success(null); + } catch (Exception e) { + log.error("HighOrderController -> addOrder() error!", e); + return ResponseMsgUtil.exception(e); + } + } - return ResponseMsgUtil.success(null); + @RequestMapping(value = "/queryMsgByList", method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "查询站内信列表") + public ResponseData queryMsgByList( + @RequestParam(value = "companyId", required = false) Long companyId, + @RequestParam(value = "type", required = false) Long type, + HttpServletRequest request) { + try { + + // 用户 + SessionObject sessionObject = userCenter.getSessionObject(request); + HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); + + Map mapUser = new HashMap<>(); + + mapUser.put("companyId" , companyId); + mapUser.put("type" , type); + mapUser.put("userId" , userInfoModel.getHighUser().getId()); + mapUser.put("msgType" , 1); + + // 查询个人站内信 + List userMsg = bsMsgService.queryMsgByList(mapUser); + + // 查询全局站内信 + Map map = new HashMap<>(); + + map.put("companyId" , companyId); + map.put("type" , type); + map.put("msgType" , 2); + + // 查询个人站内信 + List msgList = bsMsgService.queryMsgByList(map); + + msgList.addAll(userMsg); + + return ResponseMsgUtil.success(msgList); } catch (Exception e) { log.error("HighOrderController -> addOrder() error!", e); diff --git a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java index a4939137..00fe7929 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/CmsContentController.java @@ -4,10 +4,13 @@ import com.alibaba.fastjson.JSONObject; import com.hai.common.exception.ErrorCode; import com.hai.common.exception.ErrorHelp; import com.hai.common.exception.SysCode; +import com.hai.common.security.SessionObject; +import com.hai.common.security.UserCenter; import com.hai.common.utils.ResponseMsgUtil; import com.hai.config.CmsContentConfig; import com.hai.entity.*; import com.hai.model.CmsContentModel; +import com.hai.model.HighUserModel; import com.hai.model.ResponseData; import com.hai.model.UserInfoModel; import com.hai.service.*; @@ -16,6 +19,7 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -45,14 +49,24 @@ public class CmsContentController { @Resource private CmsContentConfig cmsContentConfig; + @Resource + private BsMsgService bsMsgService; + + @Autowired + private UserCenter userCenter; + @RequestMapping(value = "/getCmsContent", method = RequestMethod.GET) - @ApiOperation(value = "查询首页轮播图") + @ApiOperation(value = "查询cms内容") @ResponseBody public ResponseData getCmsContent(@RequestParam(name = "companyId", required = true) Long companyId, @RequestParam(name = "platform", required = true) Integer platform, - @RequestParam(name = "categoryCode", required = true) String categoryCode) { + @RequestParam(name = "categoryCode", required = true) String categoryCode, HttpServletRequest request) { try { + // 用户 + SessionObject sessionObject = userCenter.getSessionObject(request); + HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject(); + CmsCategory category = cmsCategoryService.getCategoryByCode(categoryCode); if (category == null) { @@ -89,7 +103,17 @@ public class CmsContentController { object.put("name" , cmsCategory.getName()); object.put("sort" , cmsCategory.getSort()); object.put("code" , cmsCategory.getCode()); - object.put("childDate" , null); + List cmsContent = cmsContentService.getListCmsContentByCategoryId(cmsCategory.getId() , companyId , platform); + object.put("jumpType" , cmsContent.get(0).getJumpType()); + object.put("jumpUrl" , cmsContent.get(0).getJumpUrl()); + + Map map = new HashMap<>(); + + map.put("companyId" , companyId); + map.put("whereCheck" , false); + map.put("userId" , userInfoModel.getHighUser().getId()); + + object.put("childDate" , bsMsgService.queryMsgByList(map)); } objectList.add(object); } diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java b/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java index ded7f07c..e2939002 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighThirdPartyController.java @@ -302,6 +302,7 @@ public class HighThirdPartyController { @ApiOperation(value = "查询第三方产品详情") public ResponseData getThirdPartyByDetail(@RequestParam(name = "platformId", required = true) Integer platformId, @RequestParam(name = "productType", required = true) Integer productType, + @RequestParam(name = "productId", required = false) Long productId, @RequestParam(name = "regionId", required = true) String regionId) { try { @@ -314,7 +315,7 @@ public class HighThirdPartyController { BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString()); - return ResponseMsgUtil.success(thirdProductConfig.getThirdPartyByDetail(platformId , productType , bsCompany.getId())); + return ResponseMsgUtil.success(thirdProductConfig.getThirdPartyByDetail(platformId , productType , bsCompany.getId() , productId)); } catch (Exception e) { log.error("HighUserCardController --> oilCardRefund() error!", e); @@ -407,7 +408,7 @@ public class HighThirdPartyController { } } else if (order.getHighChildOrderList().get(0).getGoodsType() == 9) { // 查询详单订单的实际 - JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(1, 1, order.getCompanyId()); + JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(1, 1, order.getCompanyId() , null); object = QianZhuConfig.starbucksOrderByOrderNo(order.getOrderNo()); if (object.getBoolean("success")) { diff --git a/hai-service/src/main/java/com/hai/config/CmsContentConfig.java b/hai-service/src/main/java/com/hai/config/CmsContentConfig.java index a9dcf7e0..636af62f 100644 --- a/hai-service/src/main/java/com/hai/config/CmsContentConfig.java +++ b/hai-service/src/main/java/com/hai/config/CmsContentConfig.java @@ -41,7 +41,14 @@ public class CmsContentConfig { map.put("status" , 1); PageHelper.startPage(1, 3); return new PageInfo<>( highDiscountPackageService.getDiscountPackageList(map)).getList(); - } else { + } else if (CmsContentDataEnum.REFUEL.getName().equals(title)){ + map.put("companyId", companyId); + map.put("displayArea", CmsContentDataEnum.getTypeByName(title)); + map.put("notCouponSource", 2); + map.put("status", 2); + PageHelper.startPage(1, 3); + return new PageInfo<>(highCouponService.getCouponList(map)).getList(); + } else if (CmsContentDataEnum.MSG.getName().equals(title)){ map.put("companyId", companyId); map.put("displayArea", CmsContentDataEnum.getTypeByName(title)); map.put("notCouponSource", 2); @@ -49,6 +56,7 @@ public class CmsContentConfig { PageHelper.startPage(1, 3); return new PageInfo<>(highCouponService.getCouponList(map)).getList(); } + return null; } diff --git a/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java b/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java index abaeb82f..62b53c39 100644 --- a/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java +++ b/hai-service/src/main/java/com/hai/config/ThirdProductConfig.java @@ -1,6 +1,9 @@ package com.hai.config; import com.alibaba.fastjson.JSONObject; +import com.hai.common.exception.ErrorCode; +import com.hai.common.exception.ErrorHelp; +import com.hai.common.exception.SysCode; import com.hai.entity.BsProductConfig; import com.hai.entity.BsProductDiscount; import com.hai.service.ApiProductService; @@ -43,11 +46,12 @@ public class ThirdProductConfig { } // 产品折扣比例 - public BsProductConfig getProductConfig(Integer productType , Long companyId) { + public BsProductConfig getProductConfig(Integer productType , Long companyId , Long productId) { Map listMap = new HashMap<>(); listMap.put("productType", productType); listMap.put("companyId", companyId); + listMap.put("productId", productId); List productConfigs = apiProductService.getProductConfig(listMap); @@ -57,8 +61,12 @@ public class ThirdProductConfig { return null; } - public JSONObject getThirdPartyByDetail(Integer platformId , Integer productType , Long companyId) { - BsProductConfig productConfig = getProductConfig(productType, companyId); + public JSONObject getThirdPartyByDetail(Integer platformId , Integer productType , Long companyId , Long productId) { + BsProductConfig productConfig = getProductConfig(productType, companyId , productId); + + if (productConfig == null) { + throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "暂未配置当前内容"); + } JSONObject object = new JSONObject(); diff --git a/hai-service/src/main/java/com/hai/dao/BsMsgMapper.java b/hai-service/src/main/java/com/hai/dao/BsMsgMapper.java index 5141c6f0..421c53ac 100644 --- a/hai-service/src/main/java/com/hai/dao/BsMsgMapper.java +++ b/hai-service/src/main/java/com/hai/dao/BsMsgMapper.java @@ -41,18 +41,18 @@ public interface BsMsgMapper extends BsMsgMapperExt { @Insert({ "insert into bs_msg (title, `type`, ", "jump_type, msg_type, ", - "object_id, image, ", - "content, update_time, ", - "op_name, company_id, ", - "create_time, op_id, ", + "object_id, object_type, ", + "image, content, ", + "op_id, op_name, company_id, ", + "create_time, update_time, ", "`status`, ext_1, ext_2, ", "ext_3)", "values (#{title,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, ", "#{jumpType,jdbcType=INTEGER}, #{msgType,jdbcType=INTEGER}, ", - "#{objectId,jdbcType=BIGINT}, #{image,jdbcType=VARCHAR}, ", - "#{content,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{opName,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", + "#{objectId,jdbcType=BIGINT}, #{objectType,jdbcType=INTEGER}, ", + "#{image,jdbcType=VARCHAR}, #{content,jdbcType=VARCHAR}, ", + "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", "#{ext3,jdbcType=VARCHAR})" }) @@ -71,13 +71,14 @@ public interface BsMsgMapper extends BsMsgMapperExt { @Result(column="jump_type", property="jumpType", jdbcType=JdbcType.INTEGER), @Result(column="msg_type", property="msgType", jdbcType=JdbcType.INTEGER), @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), + @Result(column="object_type", property="objectType", jdbcType=JdbcType.INTEGER), @Result(column="image", property="image", jdbcType=JdbcType.VARCHAR), @Result(column="content", property="content", jdbcType=JdbcType.VARCHAR), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT), @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @@ -87,8 +88,9 @@ public interface BsMsgMapper extends BsMsgMapperExt { @Select({ "select", - "id, title, `type`, jump_type, msg_type, object_id, image, content, update_time, ", - "op_name, company_id, create_time, op_id, `status`, ext_1, ext_2, ext_3", + "id, title, `type`, jump_type, msg_type, object_id, object_type, image, content, ", + "op_id, op_name, company_id, create_time, update_time, `status`, ext_1, ext_2, ", + "ext_3", "from bs_msg", "where id = #{id,jdbcType=BIGINT}" }) @@ -99,13 +101,14 @@ public interface BsMsgMapper extends BsMsgMapperExt { @Result(column="jump_type", property="jumpType", jdbcType=JdbcType.INTEGER), @Result(column="msg_type", property="msgType", jdbcType=JdbcType.INTEGER), @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), + @Result(column="object_type", property="objectType", jdbcType=JdbcType.INTEGER), @Result(column="image", property="image", jdbcType=JdbcType.VARCHAR), @Result(column="content", property="content", jdbcType=JdbcType.VARCHAR), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT), @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @@ -129,13 +132,14 @@ public interface BsMsgMapper extends BsMsgMapperExt { "jump_type = #{jumpType,jdbcType=INTEGER},", "msg_type = #{msgType,jdbcType=INTEGER},", "object_id = #{objectId,jdbcType=BIGINT},", + "object_type = #{objectType,jdbcType=INTEGER},", "image = #{image,jdbcType=VARCHAR},", "content = #{content,jdbcType=VARCHAR},", - "update_time = #{updateTime,jdbcType=TIMESTAMP},", + "op_id = #{opId,jdbcType=BIGINT},", "op_name = #{opName,jdbcType=VARCHAR},", "company_id = #{companyId,jdbcType=BIGINT},", "create_time = #{createTime,jdbcType=TIMESTAMP},", - "op_id = #{opId,jdbcType=BIGINT},", + "update_time = #{updateTime,jdbcType=TIMESTAMP},", "`status` = #{status,jdbcType=INTEGER},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/BsMsgSqlProvider.java b/hai-service/src/main/java/com/hai/dao/BsMsgSqlProvider.java index 14714499..54260724 100644 --- a/hai-service/src/main/java/com/hai/dao/BsMsgSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/BsMsgSqlProvider.java @@ -48,6 +48,10 @@ public class BsMsgSqlProvider { sql.VALUES("object_id", "#{objectId,jdbcType=BIGINT}"); } + if (record.getObjectType() != null) { + sql.VALUES("object_type", "#{objectType,jdbcType=INTEGER}"); + } + if (record.getImage() != null) { sql.VALUES("image", "#{image,jdbcType=VARCHAR}"); } @@ -56,8 +60,8 @@ public class BsMsgSqlProvider { sql.VALUES("content", "#{content,jdbcType=VARCHAR}"); } - if (record.getUpdateTime() != null) { - sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + if (record.getOpId() != null) { + sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}"); } if (record.getOpName() != null) { @@ -72,8 +76,8 @@ public class BsMsgSqlProvider { sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); } - if (record.getOpId() != null) { - sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}"); + if (record.getUpdateTime() != null) { + sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); } if (record.getStatus() != null) { @@ -107,13 +111,14 @@ public class BsMsgSqlProvider { sql.SELECT("jump_type"); sql.SELECT("msg_type"); sql.SELECT("object_id"); + sql.SELECT("object_type"); sql.SELECT("image"); sql.SELECT("content"); - sql.SELECT("update_time"); + sql.SELECT("op_id"); sql.SELECT("op_name"); sql.SELECT("company_id"); sql.SELECT("create_time"); - sql.SELECT("op_id"); + sql.SELECT("update_time"); sql.SELECT("`status`"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); @@ -159,6 +164,10 @@ public class BsMsgSqlProvider { sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); } + if (record.getObjectType() != null) { + sql.SET("object_type = #{record.objectType,jdbcType=INTEGER}"); + } + if (record.getImage() != null) { sql.SET("image = #{record.image,jdbcType=VARCHAR}"); } @@ -167,8 +176,8 @@ public class BsMsgSqlProvider { sql.SET("content = #{record.content,jdbcType=VARCHAR}"); } - if (record.getUpdateTime() != null) { - sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + if (record.getOpId() != null) { + sql.SET("op_id = #{record.opId,jdbcType=BIGINT}"); } if (record.getOpName() != null) { @@ -183,8 +192,8 @@ public class BsMsgSqlProvider { sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); } - if (record.getOpId() != null) { - sql.SET("op_id = #{record.opId,jdbcType=BIGINT}"); + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); } if (record.getStatus() != null) { @@ -217,13 +226,14 @@ public class BsMsgSqlProvider { sql.SET("jump_type = #{record.jumpType,jdbcType=INTEGER}"); sql.SET("msg_type = #{record.msgType,jdbcType=INTEGER}"); sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); + sql.SET("object_type = #{record.objectType,jdbcType=INTEGER}"); sql.SET("image = #{record.image,jdbcType=VARCHAR}"); sql.SET("content = #{record.content,jdbcType=VARCHAR}"); - sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + sql.SET("op_id = #{record.opId,jdbcType=BIGINT}"); sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); - sql.SET("op_id = #{record.opId,jdbcType=BIGINT}"); + sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); @@ -258,6 +268,10 @@ public class BsMsgSqlProvider { sql.SET("object_id = #{objectId,jdbcType=BIGINT}"); } + if (record.getObjectType() != null) { + sql.SET("object_type = #{objectType,jdbcType=INTEGER}"); + } + if (record.getImage() != null) { sql.SET("image = #{image,jdbcType=VARCHAR}"); } @@ -266,8 +280,8 @@ public class BsMsgSqlProvider { sql.SET("content = #{content,jdbcType=VARCHAR}"); } - if (record.getUpdateTime() != null) { - sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + if (record.getOpId() != null) { + sql.SET("op_id = #{opId,jdbcType=BIGINT}"); } if (record.getOpName() != null) { @@ -282,8 +296,8 @@ public class BsMsgSqlProvider { sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); } - if (record.getOpId() != null) { - sql.SET("op_id = #{opId,jdbcType=BIGINT}"); + if (record.getUpdateTime() != null) { + sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); } if (record.getStatus() != null) { diff --git a/hai-service/src/main/java/com/hai/dao/BsMsgUserMapperExt.java b/hai-service/src/main/java/com/hai/dao/BsMsgUserMapperExt.java index f263c72d..9a27a561 100644 --- a/hai-service/src/main/java/com/hai/dao/BsMsgUserMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/BsMsgUserMapperExt.java @@ -1,7 +1,50 @@ package com.hai.dao; +import com.hai.entity.BsMsg; +import com.hai.entity.OutRechargePrice; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.type.JdbcType; + +import java.util.List; +import java.util.Map; + /** * mapper扩展类 */ public interface BsMsgUserMapperExt { -} \ No newline at end of file + + @Select({""}) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR), + @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), + @Result(column="jump_type", property="jumpType", jdbcType=JdbcType.INTEGER), + @Result(column="msg_type", property="msgType", jdbcType=JdbcType.INTEGER), + @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), + @Result(column="image", property="image", jdbcType=JdbcType.VARCHAR), + @Result(column="content", property="content", jdbcType=JdbcType.VARCHAR), + @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List queryMsgByList(@Param("param") Map param); + +} diff --git a/hai-service/src/main/java/com/hai/entity/BsMsg.java b/hai-service/src/main/java/com/hai/entity/BsMsg.java index 9d64629c..9baeb059 100644 --- a/hai-service/src/main/java/com/hai/entity/BsMsg.java +++ b/hai-service/src/main/java/com/hai/entity/BsMsg.java @@ -43,6 +43,11 @@ public class BsMsg implements Serializable { */ private Long objectId; + /** + * 对象类型： + */ + private Integer objectType; + /** * 展示图片 */ @@ -54,9 +59,9 @@ public class BsMsg implements Serializable { private String content; /** - * 更新时间 + * 操作人员 */ - private Date updateTime; + private Long opId; /** * 操作人员名称 @@ -74,12 +79,12 @@ public class BsMsg implements Serializable { private Date createTime; /** - * 操作人员 + * 更新时间 */ - private Long opId; + private Date updateTime; /** - * 1:编辑中 2：发布 0：删除 + * 状态：1编辑中 2:发布中 0:删除 */ private Integer status; @@ -148,6 +153,14 @@ public class BsMsg implements Serializable { this.objectId = objectId; } + public Integer getObjectType() { + return objectType; + } + + public void setObjectType(Integer objectType) { + this.objectType = objectType; + } + public String getImage() { return image; } @@ -164,12 +177,12 @@ public class BsMsg implements Serializable { this.content = content; } - public Date getUpdateTime() { - return updateTime; + public Long getOpId() { + return opId; } - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; + public void setOpId(Long opId) { + this.opId = opId; } public String getOpName() { @@ -196,12 +209,12 @@ public class BsMsg implements Serializable { this.createTime = createTime; } - public Long getOpId() { - return opId; + public Date getUpdateTime() { + return updateTime; } - public void setOpId(Long opId) { - this.opId = opId; + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; } public Integer getStatus() { @@ -254,13 +267,14 @@ public class BsMsg implements Serializable { && (this.getJumpType() == null ? other.getJumpType() == null : this.getJumpType().equals(other.getJumpType())) && (this.getMsgType() == null ? other.getMsgType() == null : this.getMsgType().equals(other.getMsgType())) && (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId())) + && (this.getObjectType() == null ? other.getObjectType() == null : this.getObjectType().equals(other.getObjectType())) && (this.getImage() == null ? other.getImage() == null : this.getImage().equals(other.getImage())) && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId())) && (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) @@ -277,13 +291,14 @@ public class BsMsg implements Serializable { result = prime * result + ((getJumpType() == null) ? 0 : getJumpType().hashCode()); result = prime * result + ((getMsgType() == null) ? 0 : getMsgType().hashCode()); result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode()); + result = prime * result + ((getObjectType() == null) ? 0 : getObjectType().hashCode()); result = prime * result + ((getImage() == null) ? 0 : getImage().hashCode()); result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode()); result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); @@ -303,13 +318,14 @@ public class BsMsg implements Serializable { sb.append(", jumpType=").append(jumpType); sb.append(", msgType=").append(msgType); sb.append(", objectId=").append(objectId); + sb.append(", objectType=").append(objectType); sb.append(", image=").append(image); sb.append(", content=").append(content); - sb.append(", updateTime=").append(updateTime); + sb.append(", opId=").append(opId); sb.append(", opName=").append(opName); sb.append(", companyId=").append(companyId); sb.append(", createTime=").append(createTime); - sb.append(", opId=").append(opId); + sb.append(", updateTime=").append(updateTime); sb.append(", status=").append(status); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); diff --git a/hai-service/src/main/java/com/hai/entity/BsMsgExample.java b/hai-service/src/main/java/com/hai/entity/BsMsgExample.java index 152dc0ca..8809a9a1 100644 --- a/hai-service/src/main/java/com/hai/entity/BsMsgExample.java +++ b/hai-service/src/main/java/com/hai/entity/BsMsgExample.java @@ -495,6 +495,66 @@ public class BsMsgExample { return (Criteria) this; } + public Criteria andObjectTypeIsNull() { + addCriterion("object_type is null"); + return (Criteria) this; + } + + public Criteria andObjectTypeIsNotNull() { + addCriterion("object_type is not null"); + return (Criteria) this; + } + + public Criteria andObjectTypeEqualTo(Integer value) { + addCriterion("object_type =", value, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeNotEqualTo(Integer value) { + addCriterion("object_type <>", value, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeGreaterThan(Integer value) { + addCriterion("object_type >", value, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("object_type >=", value, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeLessThan(Integer value) { + addCriterion("object_type <", value, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeLessThanOrEqualTo(Integer value) { + addCriterion("object_type <=", value, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeIn(List values) { + addCriterion("object_type in", values, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeNotIn(List values) { + addCriterion("object_type not in", values, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeBetween(Integer value1, Integer value2) { + addCriterion("object_type between", value1, value2, "objectType"); + return (Criteria) this; + } + + public Criteria andObjectTypeNotBetween(Integer value1, Integer value2) { + addCriterion("object_type not between", value1, value2, "objectType"); + return (Criteria) this; + } + public Criteria andImageIsNull() { addCriterion("image is null"); return (Criteria) this; @@ -635,63 +695,63 @@ public class BsMsgExample { return (Criteria) this; } - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); + public Criteria andOpIdIsNull() { + addCriterion("op_id is null"); return (Criteria) this; } - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); + public Criteria andOpIdIsNotNull() { + addCriterion("op_id is not null"); return (Criteria) this; } - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); + public Criteria andOpIdEqualTo(Long value) { + addCriterion("op_id =", value, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); + public Criteria andOpIdNotEqualTo(Long value) { + addCriterion("op_id <>", value, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); + public Criteria andOpIdGreaterThan(Long value) { + addCriterion("op_id >", value, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); + public Criteria andOpIdGreaterThanOrEqualTo(Long value) { + addCriterion("op_id >=", value, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); + public Criteria andOpIdLessThan(Long value) { + addCriterion("op_id <", value, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); + public Criteria andOpIdLessThanOrEqualTo(Long value) { + addCriterion("op_id <=", value, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); + public Criteria andOpIdIn(List values) { + addCriterion("op_id in", values, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); + public Criteria andOpIdNotIn(List values) { + addCriterion("op_id not in", values, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); + public Criteria andOpIdBetween(Long value1, Long value2) { + addCriterion("op_id between", value1, value2, "opId"); return (Criteria) this; } - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); + public Criteria andOpIdNotBetween(Long value1, Long value2) { + addCriterion("op_id not between", value1, value2, "opId"); return (Criteria) this; } @@ -885,63 +945,63 @@ public class BsMsgExample { return (Criteria) this; } - public Criteria andOpIdIsNull() { - addCriterion("op_id is null"); + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); return (Criteria) this; } - public Criteria andOpIdIsNotNull() { - addCriterion("op_id is not null"); + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); return (Criteria) this; } - public Criteria andOpIdEqualTo(Long value) { - addCriterion("op_id =", value, "opId"); + public Criteria andUpdateTimeEqualTo(Date value) { + addCriterion("update_time =", value, "updateTime"); return (Criteria) this; } - public Criteria andOpIdNotEqualTo(Long value) { - addCriterion("op_id <>", value, "opId"); + public Criteria andUpdateTimeNotEqualTo(Date value) { + addCriterion("update_time <>", value, "updateTime"); return (Criteria) this; } - public Criteria andOpIdGreaterThan(Long value) { - addCriterion("op_id >", value, "opId"); + public Criteria andUpdateTimeGreaterThan(Date value) { + addCriterion("update_time >", value, "updateTime"); return (Criteria) this; } - public Criteria andOpIdGreaterThanOrEqualTo(Long value) { - addCriterion("op_id >=", value, "opId"); + public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("update_time >=", value, "updateTime"); return (Criteria) this; } - public Criteria andOpIdLessThan(Long value) { - addCriterion("op_id <", value, "opId"); + public Criteria andUpdateTimeLessThan(Date value) { + addCriterion("update_time <", value, "updateTime"); return (Criteria) this; } - public Criteria andOpIdLessThanOrEqualTo(Long value) { - addCriterion("op_id <=", value, "opId"); + public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { + addCriterion("update_time <=", value, "updateTime"); return (Criteria) this; } - public Criteria andOpIdIn(List values) { - addCriterion("op_id in", values, "opId"); + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); return (Criteria) this; } - public Criteria andOpIdNotIn(List values) { - addCriterion("op_id not in", values, "opId"); + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); return (Criteria) this; } - public Criteria andOpIdBetween(Long value1, Long value2) { - addCriterion("op_id between", value1, value2, "opId"); + public Criteria andUpdateTimeBetween(Date value1, Date value2) { + addCriterion("update_time between", value1, value2, "updateTime"); return (Criteria) this; } - public Criteria andOpIdNotBetween(Long value1, Long value2) { - addCriterion("op_id not between", value1, value2, "opId"); + public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); return (Criteria) this; } diff --git a/hai-service/src/main/java/com/hai/enum_type/CmsContentDataEnum.java b/hai-service/src/main/java/com/hai/enum_type/CmsContentDataEnum.java index 060952ac..c631426b 100644 --- a/hai-service/src/main/java/com/hai/enum_type/CmsContentDataEnum.java +++ b/hai-service/src/main/java/com/hai/enum_type/CmsContentDataEnum.java @@ -17,6 +17,7 @@ public enum CmsContentDataEnum { PREFERABLY(4 , "优选商品"), UNION_CARD(5 , "工会卡专区"), DISCOUNT(6 , "天天好券"), + MSG(90 , "消息通知"), ; private Integer type; @@ -34,6 +35,8 @@ public enum CmsContentDataEnum { } return null; } + + public Integer getType() { return type; } diff --git a/hai-service/src/main/java/com/hai/order/model/CreateOrderChildModel.java b/hai-service/src/main/java/com/hai/order/model/CreateOrderChildModel.java index 15d1ab9a..4d3f97c7 100644 --- a/hai-service/src/main/java/com/hai/order/model/CreateOrderChildModel.java +++ b/hai-service/src/main/java/com/hai/order/model/CreateOrderChildModel.java @@ -68,6 +68,10 @@ public class CreateOrderChildModel { // 代理商价格 private Boolean isTyAgent; /** ======================= 油站所需参数 ======================== **/ + /** ======================= 肯德基，星巴克，会员充值所需参数 ======================== **/ + // 下单电话 + private String customerMobile; + /** ======================= 肯德基，星巴克，会员充值所需参数 ======================== **/ } diff --git a/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java b/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java index c44110ce..7b7710fe 100644 --- a/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java +++ b/hai-service/src/main/java/com/hai/order/service/OrderCreateHandleService.java @@ -55,4 +55,7 @@ public interface OrderCreateHandleService { */ ResponseData hltUnionCardRecharge(CreateOrderChildModel createOrderChild); + +// List thirdProduct() + } diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java index ce2137e1..81b8359f 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderPaySuccessServiceImpl.java @@ -286,4 +286,6 @@ public class OrderPaySuccessServiceImpl implements OrderPaySuccessService { } } + + } diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java index 062e93af..329820e8 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java @@ -184,6 +184,7 @@ public class OrderServiceImpl implements OrderService { // 肯德基 } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE4.getNumber())) { order.setProductType(OrderProductType.PRODUCT_TYPE2.getNumber()); + // 创建肯德基订单业务 // 电影票 } else if (child.getGoodsType().equals(OrderChildGoodsType.TYPE5.getNumber())) { diff --git a/hai-service/src/main/java/com/hai/service/BsMsgService.java b/hai-service/src/main/java/com/hai/service/BsMsgService.java index 8a9a6826..745baaf3 100644 --- a/hai-service/src/main/java/com/hai/service/BsMsgService.java +++ b/hai-service/src/main/java/com/hai/service/BsMsgService.java @@ -76,5 +76,15 @@ public interface BsMsgService { */ List findMsgUserById(Long userId , Long msgId); + /** + * @Author Sum1Dream + * @Name queryMsgByList + * @Description // 查询站内信 + * @Date 16:29 2022/10/17 + * @Param [map] + * @Return java.util.List + */ + List queryMsgByList(Map map); + } diff --git a/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java index 06c1a994..ad8ce70c 100644 --- a/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java @@ -340,6 +340,9 @@ public class ApiProductServiceImpl implements ApiProductService { if (MapUtils.getString(map, "productName") != null) { criteria.andProductNameEqualTo(MapUtils.getString(map, "productName")); } + if (MapUtils.getLong(map, "productId") != null) { + criteria.andProductIdEqualTo(MapUtils.getLong(map, "productId")); + } return productConfigMapper.selectByExample(example); } diff --git a/hai-service/src/main/java/com/hai/service/impl/BsMsgServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/BsMsgServiceImpl.java index 7a518aba..4a9fd11f 100644 --- a/hai-service/src/main/java/com/hai/service/impl/BsMsgServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/BsMsgServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.beans.Transient; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.jar.JarEntry; @@ -94,7 +95,7 @@ public class BsMsgServiceImpl implements BsMsgService { // 查询用户相关站内信内容 List list = findMsgUserById(user.getId() , msgId); BsMsgUser bsMsgUser = new BsMsgUser(); - // 判读是否有呢日 + // 判读是否有数据 if (list.size()>0) { bsMsgUser = list.get(0); // 判断当前内容是否已经查看过了 @@ -127,4 +128,9 @@ public class BsMsgServiceImpl implements BsMsgService { return bsMsgUserMapper.selectByExample(example); } + + @Override + public List queryMsgByList(Map map) { + return bsMsgUserMapper.queryMsgByList(map); + } } diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index 9a5427a8..ba6bf16b 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java @@ -2464,7 +2464,7 @@ public class HighOrderServiceImpl implements HighOrderService { BigDecimal marketPrice = new BigDecimal(0); // 查询详单订单的实际 - JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(object.getInteger("platformId"), object.getInteger("productType"), object.getLong("companyId")); + JSONObject productDetail = thirdProductConfig.getThirdPartyByDetail(object.getInteger("platformId"), object.getInteger("productType"), object.getLong("companyId") , object.getLong("productId")); highOrder.setProductType(object.getInteger("productType"));