diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvFrontPageDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvFrontPageDao.java new file mode 100644 index 0000000..f092191 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvFrontPageDao.java @@ -0,0 +1,40 @@ +package com.heyu.api.data.dao.vv; +/** +*

+* 服务类 +*

+* +* @author quyixiao +* @since 2025-12-18 +*/ +import com.heyu.api.data.entity.vv.VvFrontPageEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface VvFrontPageDao extends BaseMapper { + + + VvFrontPageEntity selectVvFrontPageById(@Param("id")Long id); + + + Long insertVvFrontPage(VvFrontPageEntity vvFrontPage); + + + Long insertOrUpdateVvFrontPage(VvFrontPageEntity vvFrontPage); + + + int updateVvFrontPageById(VvFrontPageEntity vvFrontPage); + + + int updateCoverVvFrontPageById(VvFrontPageEntity vvFrontPage); + + + int deleteVvFrontPageById(@Param("id")Long id); + + + List selectVvFrontPageAll(); +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvFrontPageEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvFrontPageEntity.java new file mode 100644 index 0000000..ad7aa67 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvFrontPageEntity.java @@ -0,0 +1,201 @@ +package com.heyu.api.data.entity.vv; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.lz.mybatis.plugin.annotations.AS; + +import java.math.BigDecimal; +import java.util.Date;import java.util.Date; +/** +* +* @author quyixiao +* @since 2025-12-19 +*/ + +@Data +@TableName("vv_front_page") +public class VvFrontPageEntity implements java.io.Serializable { +private static final long serialVersionUID = 1L; + + public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvFrontPageEntity:"; + + public final static String all = CLASS_NAME + "*"; + public final static String id_ = CLASS_NAME + "id"; // + public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除 + public final static String create_time = CLASS_NAME + "create_time"; // 创建时间 + public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间 + public final static String name_ = CLASS_NAME + "name"; // 名称 + public final static String type_ = CLASS_NAME + "type"; // 类型 + public final static String style_ = CLASS_NAME + "style"; // 样式 + public final static String data_ = CLASS_NAME + "data"; // 数据 + public final static String params_ = CLASS_NAME + "params"; // 参数 + // + @TableId(value = "id", type = IdType.AUTO) + private Long id; + //是否删除：0 否 1 删除 + private Integer isDelete; + //创建时间 + private Date createTime; + //修改时间 + private Date modifyTime; + //名称 + private String name; + //类型 + private String type; + //样式 + private String style; + //数据 + private String data; + //参数 + private String params; + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 是否删除：0 否 1 删除 + * @return + */ + public Integer getIsDelete() { + return isDelete; + } + /** + * 是否删除：0 否 1 删除 + * @param isDelete + */ + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + /** + * 创建时间 + * @return + */ + public Date getCreateTime() { + return createTime; + } + /** + * 创建时间 + * @param createTime + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 修改时间 + * @return + */ + public Date getModifyTime() { + return modifyTime; + } + /** + * 修改时间 + * @param modifyTime + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** + * 名称 + * @return + */ + public String getName() { + return name; + } + /** + * 名称 + * @param name + */ + public void setName(String name) { + this.name = name; + } + + /** + * 类型 + * @return + */ + public String getType() { + return type; + } + /** + * 类型 + * @param type + */ + public void setType(String type) { + this.type = type; + } + + /** + * 样式 + * @return + */ + public String getStyle() { + return style; + } + /** + * 样式 + * @param style + */ + public void setStyle(String style) { + this.style = style; + } + + /** + * 数据 + * @return + */ + public String getData() { + return data; + } + /** + * 数据 + * @param data + */ + public void setData(String data) { + this.data = data; + } + + /** + * 参数 + * @return + */ + public String getParams() { + return params; + } + /** + * 参数 + * @param params + */ + public void setParams(String params) { + this.params = params; + } + + @Override + public String toString() { + return "VvFrontPageEntity{" + + ",id=" + id + + ",isDelete=" + isDelete + + ",createTime=" + createTime + + ",modifyTime=" + modifyTime + + ",name=" + name + + ",type=" + type + + ",style=" + style + + ",data=" + data + + ",params=" + params + + "}"; + } +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/ActionEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/ActionEnums.java index a7bc48b..5d1a849 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/enums/ActionEnums.java +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/ActionEnums.java @@ -5,7 +5,7 @@ public enum ActionEnums { Admin_Cancel("Admin_Cancel", "admin取消按钮", "/mm/order/cancel", OrderStatusEnums.cancel.getStatus()), - App_Apply_Cancel("App_Apply_Cancel", "app申请取消按钮", "/app/order/applyCancel", OrderStatusEnums.apply_cancel.getStatus()), + App_Apply_Cancel("App_Apply_Cancel", "取消订单", "/app/order/applyCancel", OrderStatusEnums.apply_cancel.getStatus()), Admin_Delivered("Admin_Delivered", "admin妥投,确认收货", "/mm/order/delivered",OrderStatusEnums.delivered.getStatus()), diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvFrontPageServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvFrontPageServiceImpl.java new file mode 100644 index 0000000..4c36baa --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvFrontPageServiceImpl.java @@ -0,0 +1,68 @@ +package com.heyu.api.data.service.impl.vv; +/** +*

+* 服务类 +*

+* +* @author quyixiao +* @since 2025-12-18 +*/ + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.heyu.api.data.dao.vv.VvFrontPageDao; +import com.heyu.api.data.entity.vv.VvFrontPageEntity; +import com.heyu.api.data.service.vv.VvFrontPageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +@Service +public class VvFrontPageServiceImpl extends ServiceImpl implements VvFrontPageService { + + + @Autowired + private VvFrontPageDao vvFrontPageDao; + + + + @Override + public VvFrontPageEntity selectVvFrontPageById(Long id){ + return vvFrontPageDao.selectVvFrontPageById(id); + } + + + + @Override + public Long insertVvFrontPage(VvFrontPageEntity vvFrontPage){ + return vvFrontPageDao.insertVvFrontPage(vvFrontPage); + } + + + + @Override + public Long insertOrUpdateVvFrontPage(VvFrontPageEntity vvFrontPage){ + return vvFrontPageDao.insertOrUpdateVvFrontPage(vvFrontPage); + } + + + + @Override + public int updateVvFrontPageById(VvFrontPageEntity vvFrontPage){ + return vvFrontPageDao.updateVvFrontPageById(vvFrontPage); + } + + + + @Override + public int updateCoverVvFrontPageById(VvFrontPageEntity vvFrontPage){ + return vvFrontPageDao.updateCoverVvFrontPageById(vvFrontPage); + } + + + + @Override + public int deleteVvFrontPageById(Long id){ + return vvFrontPageDao.deleteVvFrontPageById(id); + } + + + +} diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvFrontPageService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvFrontPageService.java new file mode 100644 index 0000000..2b54dc5 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvFrontPageService.java @@ -0,0 +1,34 @@ +package com.heyu.api.data.service.vv; +/** +*

+* 服务类 +*

+* +* @author quyixiao +* @since 2025-12-18 +*/ +import com.baomidou.mybatisplus.extension.service.IService; +import com.heyu.api.data.entity.vv.VvFrontPageEntity; +public interface VvFrontPageService extends IService { + + + + VvFrontPageEntity selectVvFrontPageById(Long id); + + + Long insertVvFrontPage(VvFrontPageEntity vvFrontPage); + + + Long insertOrUpdateVvFrontPage(VvFrontPageEntity vvFrontPage); + + + int updateVvFrontPageById(VvFrontPageEntity vvFrontPage); + + + int updateCoverVvFrontPageById(VvFrontPageEntity vvFrontPage); + + + int deleteVvFrontPageById(Long id); + + +} \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/utils/RedisUtils.java b/api-mapper/src/main/java/com/heyu/api/data/utils/RedisUtils.java index 440bedf..9ca1df3 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/utils/RedisUtils.java +++ b/api-mapper/src/main/java/com/heyu/api/data/utils/RedisUtils.java @@ -77,10 +77,16 @@ public class RedisUtils { public static boolean BIZ_CACHE_SWITCH = true;//业务缓存开关，true：打开（即使用缓存） false：关闭（即不使用缓存） public void set(String key, Object value, long expire) { - valueOperations.set(key, toJson(value)); - if (expire != NOT_EXPIRE) { - redisTemplate.expire(key, expire, TimeUnit.SECONDS); + try { + valueOperations.set(key, toJson(value)); + if (expire != NOT_EXPIRE) { + redisTemplate.expire(key, expire, TimeUnit.SECONDS); + } + } catch (Exception e) { + logger.error("set redis error", e); } + + } public void set(String key, Object value) { diff --git a/api-mapper/src/main/resources/mapper/vv/VvFrontPageDao.xml b/api-mapper/src/main/resources/mapper/vv/VvFrontPageDao.xml new file mode 100644 index 0000000..ea4d52f --- /dev/null +++ b/api-mapper/src/main/resources/mapper/vv/VvFrontPageDao.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java index 846bfa6..327f9b6 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java @@ -94,7 +94,7 @@ public class MysqlMain_insert { List list = new ArrayList(); - list.add(new TablesBean("vv_out_trade_no")); + list.add(new TablesBean("vv_front_page")); diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java index 9d7aca8..89f0660 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java @@ -48,7 +48,7 @@ public class MysqlMain_update { } List list = new ArrayList(); - list.add(new TablesBean("vv_comment")); + list.add(new TablesBean("vv_front_page")); Map map = MysqlUtil2ShowCreateTable.getComments(); for (int i = 0; i < list.size(); i++) { diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppBuyerInfoRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppBuyerInfoRequest.java new file mode 100644 index 0000000..e63efb6 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppBuyerInfoRequest.java @@ -0,0 +1,20 @@ +package com.heyu.api.alibaba.request.mm; + +import com.heyu.api.data.service.impl.AppBaseRequest; +import lombok.Data; + +@Data +public class VvAppBuyerInfoRequest extends AppBaseRequest { + + //买家名称 + private String buyerName; + + + //微信头像 + private String avatar; + + + + + +} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppFontPageController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppFontPageController.java new file mode 100644 index 0000000..d6835bb --- /dev/null +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppFontPageController.java @@ -0,0 +1,44 @@ +package com.heyu.api.controller.vv; + + +import com.heyu.api.common.annotation.AppLogin; +import com.heyu.api.common.annotation.Describe; +import com.heyu.api.data.dao.vv.VvFrontPageDao; +import com.heyu.api.data.entity.vv.VvFrontPageEntity; +import com.heyu.api.data.service.impl.AppBaseRequest; +import com.heyu.api.data.utils.R; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + + +@Slf4j +@RestController +@RequestMapping("/app/font") +@AppLogin +public class AppFontPageController { + + + @Autowired + private VvFrontPageDao vvFrontPageDao; + + /*** + * 列表 + * /app/font/page + */ + @Describe("首页信息") + @RequestMapping("/page") + public R list(@RequestBody AppBaseRequest request) { + + + List vvFrontPageEntityList = vvFrontPageDao.selectVvFrontPageAll(); + + return R.ok().setData(vvFrontPageEntityList); + } + + +} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index fbf5080..db489c7 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -632,7 +632,7 @@ public class AppOrderController { // /app/order/delete @Describe("删除订单") @RequestMapping("/delete") - public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) { + public R delete(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) { List vvTradeOrderLineEntityList = null; if (StringUtils.isNotEmpty(vvOrderRequest.getTrackNumber())) { vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumberBuyerId(vvOrderRequest.getTrackNumber(), vvOrderRequest.getBuyerId()); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java index f2933c7..7453362 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java @@ -77,17 +77,19 @@ public class AppShoppingCartController { skuIds.add(vvShoppingCartEntity.getSkuId()); } - List vvSkuEntities = vvSkuDao.selectVvSkuListByIds(skuIds); - for (VvShoppingCartEntity vvShoppingCartEntity : shoppingCartEntities) { - VvShoppingCartDTO vvShoppingCartDTO = new VvShoppingCartDTO(); - BeanUtils.copyProperties(vvShoppingCartEntity, vvShoppingCartDTO); + if(CollectionUtils.isNotEmpty(skuIds)){ + List vvSkuEntities = vvSkuDao.selectVvSkuListByIds(skuIds); + for (VvShoppingCartEntity vvShoppingCartEntity : shoppingCartEntities) { + VvShoppingCartDTO vvShoppingCartDTO = new VvShoppingCartDTO(); + BeanUtils.copyProperties(vvShoppingCartEntity, vvShoppingCartDTO); - for (VvSkuEntity vvSkuEntity : vvSkuEntities) { - if (NumberUtil.equals(vvShoppingCartEntity.getSkuId(), vvSkuEntity.getId())) { - vvShoppingCartDTO.setVvSkuEntity(vvSkuEntity); + for (VvSkuEntity vvSkuEntity : vvSkuEntities) { + if (NumberUtil.equals(vvShoppingCartEntity.getSkuId(), vvSkuEntity.getId())) { + vvShoppingCartDTO.setVvSkuEntity(vvSkuEntity); + } } + vvShoppingCartDTOS.add(vvShoppingCartDTO); } - vvShoppingCartDTOS.add(vvShoppingCartDTO); } pageUtils.setRows(vvShoppingCartDTOS); @@ -157,7 +159,7 @@ public class AppShoppingCartController { */ @Describe("删除购物车中商品") @RequestMapping("/delete") - public R delete(AppShippingCartDeleteRequest appShippingCartDeleteRequest) { + public R delete(@RequestBody AppShippingCartDeleteRequest appShippingCartDeleteRequest) { vvShoppingCartDao.deleteVvShoppingCartByIds(appShippingCartDeleteRequest.getShoppingCartIds()); return R.ok(); } diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java index e885241..c171750 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java @@ -43,4 +43,4 @@ public class AppUploadOssController { } -} +} \ No newline at end of file diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUserLoginController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUserLoginController.java index ba9e79a..abbb533 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUserLoginController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUserLoginController.java @@ -4,6 +4,7 @@ package com.heyu.api.controller.vv; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.heyu.api.alibaba.request.mm.VvAnonymousUserLoginRequest; +import com.heyu.api.alibaba.request.mm.VvAppBuyerInfoRequest; import com.heyu.api.alibaba.request.mm.VvAppLoginRequest; import com.heyu.api.alibaba.request.mm.order.VvActivityDTO; import com.heyu.api.alibaba.request.vv.AppUserLoginRequest; @@ -110,6 +111,24 @@ public class AppUserLoginController { } + // http://localhost:8888/app/buyer/info/update + @RequestMapping("/buyer/info/update") + @Describe("目标用户登录") + public R buyerInfoUpdate(@RequestBody VvAppBuyerInfoRequest request) { + VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(request.getBuyerId()); + if (vvBuyerEntity == null) { + return R.error("你不是内部用户"); + } + vvBuyerEntity.setBuyerName(request.getBuyerName()); + vvBuyerEntity.setAvatar(request.getAvatar()); + vvBuyerDao.insertOrUpdateVvBuyer(vvBuyerEntity); + + return R.ok().put("buyer", vvBuyerEntity); + } + + + + public void replaceActivityInfo(AppBaseRequest request, String uri) { String activityTokenInfo = redisUtils.get(ApiConstants.token_activity + request.getToken()); if (StringUtils.isNotEmpty(activityTokenInfo)) {