add:浏览记录

alien-entity/src/main/java/shop/alien/mapper/LifeBrowseRecordMapper.java

@@ -27,14 +27,14 @@ public interface LifeBrowseRecordMapper extends BaseMapper<LifeBrowseRecord> {
             "left join store_info si on si.id = lgbm.store_id and si.delete_flag = 0\n" +
             "left join store_img si2 on si2.id = SUBSTRING_INDEX(lgbm.image_id, ',', 1) and si2.delete_flag = 0\n" +
             "where lbr.user_id = #{userId} and lbr.coupon_id is not null\n" +
-            "Order by lbr.liulan_time")
+            "Order by lbr.liulan_time desc")
     List<Map<String, Object>> getGroupBuyBrowseRecordByUserId(String userId);
 
-    @Select("select lbr.id,lud.*,lbr.liulan_date liulanDate\n" +
+    @Select("select lbr.id,lud.*,lud.id dynamicsId,lbr.liulan_date liulanDate\n" +
             "from life_browse_record lbr \n" +
             "inner join life_user_dynamics lud on lud.id = lbr.dynamics_id \n" +
             "and lud.delete_flag = 0 and lbr.delete_flag = 0 \n" +
             "where lbr.user_id = #{userId} and lbr.dynamics_id is not null\n" +
-            "Order by lbr.liulan_time")
+            "Order by lbr.liulan_time desc")
     List<Map<String, Object>> getDynamicsBrowseRecordByUserId(String userId);
 }

alien-store/src/main/java/shop/alien/store/controller/LifeUserDynamicsController.java

@@ -15,8 +15,6 @@ import shop.alien.entity.store.vo.LifePinglunVo;
 import shop.alien.entity.store.vo.LifeUserDynamicsVo;
 import shop.alien.store.service.LifeUserDynamicsService;
 import shop.alien.util.common.ListToPage;
-import shop.alien.util.common.netease.ImageCheckUtil;
-import shop.alien.util.common.netease.TextCheckUtil;
 import shop.alien.util.common.safe.*;
 
 import java.util.ArrayList;
@@ -158,9 +156,12 @@ public class LifeUserDynamicsController {
     }
 
     @PostMapping("addLiulanShu")
-    public int dianzan(String id) {
+    public R dianzan(String id) {
         log.info("LifeUserDynamicsController.addLiulanShu?id={}", id);
-        return lifeUserDynamicsService.addLiulanCount(id);
+        if (lifeUserDynamicsService.addLiulanCount(id) == 0){
+            return R.fail("操作失败");
+        }
+        return R.success("操作成功");
     }
 
     @ApiOperation("草稿列表")

alien-store/src/main/java/shop/alien/store/service/impl/LifeCouponServiceImpl.java

@@ -274,11 +274,11 @@ public class LifeCouponServiceImpl extends ServiceImpl<LifeCouponMapper, LifeCou
             // 计算总退款金额(orderCouponMiddle金额按实际的存)
             BigDecimal refundAmount = couponMiddleList.stream().filter(x -> x.getStatus() == OrderStatusEnum.REFUND.getStatus()).map(x -> x.getPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
             StoreInfo storeInfo = storeInfoMapper.selectOne(new LambdaQueryWrapper<StoreInfo>().eq(StoreInfo::getId, lifeUserOrder.getStoreId()));
-            // TODO 抽成比例应该从商户里
             BigDecimal amounts = new BigDecimal(lifeUserOrder.getFinalPrice()).multiply(new BigDecimal(100)).subtract(refundAmount);
             // 先将抽成比例转换为BigDecimal，再除以100
             BigDecimal commissionRate = new BigDecimal(storeInfo.getCommissionRate())
                     .divide(new BigDecimal(100));
+            // 感觉有问题。HALF_UP有问题。
             BigDecimal commission = amounts.multiply(commissionRate).setScale(0, RoundingMode.HALF_UP);
             BigDecimal money = amounts.subtract(commission);