用户端代码提交

pz-system/src/main/java/com/pz/system/domain/vo/StoreGoodsVo.java

@@ -64,7 +64,7 @@ public class StoreGoodsVo extends BaseEntity {
      * 售价
      */
     @ExcelProperty(value = "售价")
-    private String salePrice;
+    private double salePrice;
 
     /**
      * 小封面图

pz-system/src/main/java/com/pz/system/domain/vo/TotalOrderVo.java

@@ -317,4 +317,15 @@ public class TotalOrderVo {
      * 陪诊员ID
      */
     private Integer eUserId;
+
+    /**
+     * 商品封面
+     */
+    private String smallCover;
+
+    private double price;
+
+    private Integer num;
+
+    private String intro;
 }

pz-system/src/main/java/com/pz/system/mapper/StoreGoodsMapper.java

@@ -13,5 +13,4 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface StoreGoodsMapper extends BaseMapperPlus<StoreGoodsMapper, StoreGoods, StoreGoodsVo> {
-
 }

pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java

@@ -69,7 +69,7 @@ public class ArticleServiceImpl implements IArticleService {
         //收藏数量
         articleVo.setCollectNum(Math.toIntExact(aLong1));
         //用户评论
-        List<ArticleCommentVo> articleCommentVos = articleCommentMapper.selectVoList(Wrappers.<ArticleComment>lambdaQuery().eq(ArticleComment::getAid, id).eq(ArticleComment::getUid, LoginHelper.getLoginUser().getUserId().intValue()));
+        List<ArticleCommentVo> articleCommentVos = articleCommentMapper.selectVoList(Wrappers.<ArticleComment>lambdaQuery().eq(ArticleComment::getAid, id));
 
         for (ArticleCommentVo articleCommentVo : articleCommentVos) {
             if (null != articleCommentVo.getUid()) {

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -259,6 +259,11 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             totalOrderBo.setPhone(userAddressVo.getPhone());
             totalOrderBo.setLogisticsCode(storeOrder.getLogisticsCode());
             totalOrderVo.setObject(selectLogisticsStatus(totalOrderBo));
+            totalOrderVo.setName(storeGoods.getTitle());
+            totalOrderVo.setNum(storeOrder.getNum());
+            totalOrderVo.setSmallCover(storeGoods.getSmallCover());
+            totalOrderVo.setPrice(storeGoods.getSalePrice());
+            totalOrderVo.setIntro(storeGoods.getIntro());
         }
         return totalOrderVo;
     }

pz-system/src/main/java/com/pz/system/service/impl/UserAddressServiceImpl.java

@@ -98,7 +98,7 @@ public class UserAddressServiceImpl implements IUserAddressService {
     public Boolean updateByBo(UserAddressBo bo) {
         UserAddress update = BeanUtil.toBean(bo, UserAddress.class);
         validEntityBeforeSave(update);
-        if(null != update.getIsDefult() && update.getIsDefult() == 1){
+        if(update.getIsDefult() == 1){
             LambdaUpdateWrapper<UserAddress> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
             lambdaUpdateWrapper.eq(UserAddress::getUid,bo.getUid())
                 .set(UserAddress::getIsDefult,0);

pz-system/src/main/resources/mapper/system/StoreGoodsMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.pz.system.mapper.StoreGoodsMapper">
+</mapper>