用户端代码提交

pz-applet/src/main/java/com/pz/applet/AppletArticleController.java

@@ -10,6 +10,7 @@ import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.validate.AddGroup;
 import com.pz.common.core.validate.EditGroup;
 import com.pz.common.enums.BusinessType;
+import com.pz.common.helper.LoginHelper;
 import com.pz.common.utils.poi.ExcelUtil;
 import com.pz.system.domain.UserAppreciate;
 import com.pz.system.domain.bo.ArticleBo;
@@ -68,7 +69,7 @@ public class AppletArticleController extends BaseController {
     @RepeatSubmit()
     @PostMapping("/Appreciate")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserAppreciateBo bo) {
-        bo.setUid(1);
+        bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
         return toAjax(iArticleService.insertByAppreciate(bo));
     }
 
@@ -78,7 +79,7 @@ public class AppletArticleController extends BaseController {
     @RepeatSubmit()
     @PostMapping("/Collect")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCollectBo bo) {
-        bo.setUid(1);
+        bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
         return toAjax(iArticleService.insertByCollect(bo));
     }
 

pz-applet/src/main/java/com/pz/applet/AppletUserAddressController.java

@@ -44,6 +44,7 @@ public class AppletUserAddressController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo<UserAddressVo> list(UserAddressBo bo, PageQuery pageQuery) {
+        bo.setUid(LoginHelper.getLoginUser().getUserId().intValue());
         return iUserAddressService.queryPageList(bo, pageQuery);
     }
 

pz-applet/src/main/java/com/pz/applet/AppletUserVsitorController.java

@@ -6,6 +6,7 @@ import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.R;
+import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.validate.AddGroup;
 import com.pz.common.enums.BusinessType;
@@ -39,6 +40,8 @@ public class AppletUserVsitorController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo<UserVsitorVo> list(UserVsitorBo bo, PageQuery pageQuery) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        bo.setUid(loginUser.getUserId().intValue());
         return iUserVsitorService.queryPageList(bo, pageQuery);
     }
     /**

pz-system/src/main/java/com/pz/system/domain/StoreGoods.java

@@ -5,6 +5,8 @@ import com.pz.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 
 /**
  * 商品对象 store_goods
@@ -43,11 +45,11 @@ public class StoreGoods extends BaseEntity {
     /**
      * 原价
      */
-    private String price;
+    private BigDecimal price;
     /**
      * 售价
      */
-    private String salePrice;
+    private BigDecimal salePrice;
     /**
      * 小封面图
      */

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

@@ -9,6 +9,7 @@ import com.pz.system.domain.Carousel;
 import com.pz.system.domain.StoreGoodsTag;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 
@@ -58,13 +59,13 @@ public class StoreGoodsVo extends BaseEntity {
      * 原价
      */
     @ExcelProperty(value = "原价")
-    private String price;
+    private BigDecimal price;
 
     /**
      * 售价
      */
     @ExcelProperty(value = "售价")
-    private double salePrice;
+    private BigDecimal salePrice;
 
     /**
      * 小封面图

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

@@ -7,6 +7,7 @@ import com.pz.common.convert.ExcelDictConvert;
 import com.pz.system.domain.StoreGoodsTag;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -323,7 +324,7 @@ public class TotalOrderVo {
      */
     private String smallCover;
 
-    private double price;
+    private BigDecimal price;
 
     private Integer num;
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.pz.common.core.domain.entity.SysUser;
+import com.pz.common.core.domain.model.LoginUser;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -57,23 +58,27 @@ public class ArticleServiceImpl implements IArticleService {
      */
     @Override
     public ArticleVo queryById(Integer id) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+
         ArticleVo articleVo = baseMapper.selectVoById(id);
         Long aLong = userAppreciateMapper.selectCount(Wrappers.<UserAppreciate>lambdaQuery().eq(UserAppreciate::getAid, id));
+        Long aLong2 = userAppreciateMapper.selectCount(Wrappers.<UserAppreciate>lambdaQuery().eq(UserAppreciate::getAid, id).eq(UserAppreciate::getUid,loginUser.getUserId()));
         Long aLong1 = userCollectMapper.selectCount(Wrappers.<UserCollect>lambdaQuery().eq(UserCollect::getAid, id));
+        Long aLong3 = userCollectMapper.selectCount(Wrappers.<UserCollect>lambdaQuery().eq(UserCollect::getAid, id).eq(UserCollect::getUid,loginUser.getUserId()));
         //是否点赞
-        articleVo.setAppreciate(aLong != 0);
+        articleVo.setAppreciate(aLong2 != 0);
         //点赞数量
         articleVo.setAppreciateNum(Math.toIntExact(aLong));
         //是否收藏
-        articleVo.setCollect(aLong1 != 0);
+        articleVo.setCollect(aLong3 != 0);
         //收藏数量
         articleVo.setCollectNum(Math.toIntExact(aLong1));
         //用户评论
-        List<ArticleCommentVo> articleCommentVos = articleCommentMapper.selectVoList(Wrappers.<ArticleComment>lambdaQuery().eq(ArticleComment::getAid, id));
+        List<ArticleCommentVo> articleCommentVos = articleCommentMapper.selectVoList(Wrappers.<ArticleComment>lambdaQuery().eq(ArticleComment::getAid, id).eq(ArticleComment::getUid,loginUser.getUserId()));
 
         for (ArticleCommentVo articleCommentVo : articleCommentVos) {
             if (null != articleCommentVo.getUid()) {
-                SysUser sysUser = sysUserMapper.selectById(LoginHelper.getLoginUser().getUserId().intValue());
+                SysUser sysUser = sysUserMapper.selectById(loginUser.getUserId().intValue());
                 articleCommentVo.setAvatar(sysUser.getAvatar());
                 articleCommentVo.setUserName(sysUser.getUserName());
             }
@@ -147,8 +152,8 @@ public class ArticleServiceImpl implements IArticleService {
         LambdaQueryWrapper<Article> lqw = new LambdaQueryWrapper<>();
         //Page<ArticleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         // TODO 待登录写完修改
-        //int userId = LoginHelper.getLoginUser().getUserId().intValue();
-        int userId = 1;
+        int userId = LoginHelper.getLoginUser().getUserId().intValue();
+        //int userId = 1;
         Page<ArticleVo> result = new Page<>();
         //判断是否展示收藏文章
         if (bo.getIsCollect() == 1) {

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

@@ -543,7 +543,13 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             return this.refundOrder(totalOrderBo);
         }
 
-        if (totalOrder.getEmId() == 0) {// 预约陪诊
+        // 已付款 未结单直接退款
+        if (sonOrderSimpleDataByTotalId.getOrderStatus() == 0 && totalOrder.getStatus() == 1) {
+            totalOrderBo.setIsRefund(0);
+            return this.refundOrder(totalOrderBo);
+        }
+
+        if (sonOrderSimpleDataByTotalId.getOrderStatus() == 0 && totalOrder.getEmId() == 0 && totalOrder.getStatus() == 0) {// 预约陪诊
             // yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId,totalOrder));
             totalOrder.setStatus(TotalOrderStatus.CANCEL.getCode());
             return baseMapper.updateById(totalOrder) > 0;
@@ -617,10 +623,18 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
 
         ISonOrderService orderService = serviceBuilder.getSonOrderService(totalOrder.getBusinessId());
         Objects.requireNonNull(orderService, "订单业务属性出错");
+
+        SonOrderVo sonOrderSimpleDataByTotalId = orderService.getSonOrderSimpleDataByTotalId(totalOrder.getId().intValue());
+
+        // 已付款 未结单直接退款
+        if (sonOrderSimpleDataByTotalId.getOrderStatus() == 0 && totalOrder.getStatus() == 1) {
+            totalOrder.setStatus(TotalOrderStatus.CANCEL.getCode());
+        }
+
         // 修改子订单状态
         boolean sonOrderFlag = orderService.switchSonOrderStatus(totalOrder.getId(), CommonOrderStatus.REFUND.getCode());
 
-        if (!sonOrderFlag) {
+        if (sonOrderFlag) {
             throw new ServiceException("子订单状态修改出错，接单失败");
         }
         if (baseMapper.updateById(totalOrder) > 0) {