Procházet zdrojové kódy

根据报错日志调整部分代码

codingliang před 1 rokem
rodič
revize
a3ee534648

+ 11 - 1
src/main/java/com/sqx/modules/order/controller/app/AppOrderController.java

@@ -1,6 +1,8 @@
 package com.sqx.modules.order.controller.app;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.sqx.common.exception.SqxException;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.app.annotation.Login;
 import com.sqx.modules.order.entity.Evaluate;
@@ -13,7 +15,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
@@ -41,6 +48,9 @@ public class AppOrderController {
     @PostMapping("/updateOrdersRemark")
     public Result updateOrdersRemark(Long orderId,String remark){
         TbOrder tbOrder = appOrderService.getById(orderId);
+        if (ObjectUtil.isNull(tbOrder)) {
+            throw new SqxException("无效的订单id");
+        }
         tbOrder.setRemark(remark);
         appOrderService.updateById(tbOrder);
         return Result.success();

+ 5 - 1
src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1576,6 +1576,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     public Result selectOrderById(Long orderId) {
         TbOrder tbOrder = appOrderDao.selectByOrderId(orderId);
 
+        if (ObjectUtil.isNull(tbOrder)) {
+            throw new SqxException("无效的订单id");
+        }
+
         int i = appOrderDao.selectCountOrderByTime(tbOrder.getPayTime(), tbOrder.getShopId());
         tbOrder.setCountOrder(i);
         if (tbOrder.getCouponId() != null) {
@@ -2633,7 +2637,7 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             tbOrderList.getRecords().get(i).setOrderGoodsList(list);
         }
         if (shopId != null && userId != null) {
-            UserBrowse userBrowse = userBrowseDao.selectOne(new QueryWrapper<UserBrowse>().eq("user_id", userId).eq("by_browse_id", shopId));
+            UserBrowse userBrowse = userBrowseDao.selectOne(new QueryWrapper<UserBrowse>().eq("user_id", userId).eq("by_browse_id", shopId).last("limit 1"));
             String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
             if (userBrowse != null) {
                 userBrowse.setUpdateTime(format);

+ 1 - 1
src/main/resources/mapper/integra/UserIntegralDetailsMapper.xml

@@ -20,7 +20,7 @@
     </select>
 
     <select id="selectUserIntegralDetails" resultType="com.sqx.modules.integral.entity.UserIntegralDetails">
-        select * from user_integral_details where user_id = #{userId} and date_format(create_time,'%Y-%m-%d')=date_format(#{date},'%Y-%m-%d') and classify = 1
+        select * from user_integral_details where user_id = #{userId} and date_format(create_time,'%Y-%m-%d')=date_format(#{date},'%Y-%m-%d') and classify = 1 limit 1
     </select>
 
     <select id="queryIntegralList" resultType="com.sqx.modules.integral.entity.UserIntegralDetails">

+ 1 - 0
src/main/resources/mapper/order/OrderMapper.xml

@@ -508,6 +508,7 @@
                  left join tb_user tus on ti.user_id = tus.user_id
                  left join evaluate e on tor.order_number = e.order_number
         where tor.order_id = #{orderId}
+        limit 1
     </select>
 
     <select id="selectBuyGoods" resultType="com.sqx.modules.order.entity.TbOrder">