bugfix

src/main/java/com/caimei365/order/mapper/BaseMapper.java

@@ -216,4 +216,5 @@ public interface BaseMapper {
 
     UserBeansHistoryPo findLowOrder(Integer orderId);
 
+    Integer findBeans(Integer userId);
 }

src/main/java/com/caimei365/order/service/impl/OrderSellerServiceImpl.java

@@ -51,6 +51,7 @@ public class OrderSellerServiceImpl implements OrderSellerService {
         PageHelper.startPage(pageNum, pageSize);
         // 获取订单列表
         List<OrderVo> orderList = orderSellerMapper.getOrderList(clubUserIds, listType, orderSubmitType, orderNo);
+        orderList.removeIf(orderVo -> orderVo.getOrderSeen() == 2);
         //设置主订单数据
         orderList.forEach(this::setSellerOrder);
         PageInfo<OrderVo> pageInfo = new PageInfo(orderList);
@@ -173,7 +174,9 @@ public class OrderSellerServiceImpl implements OrderSellerService {
             // 最后查看订单时间
             Date lastCheckOrderDate = orderSellerMapper.getLastCheckOrderDate(userId);
             Integer i = orderSellerMapper.getUncheckedOrderCount(userId, lastCheckOrderDate);
-            if (null != i) {uncheckedOrderCount += i;}
+            if (null != i) {
+                uncheckedOrderCount += i;
+            }
         }
         map.put("uncheckedOrderCount", uncheckedOrderCount);
         return ResponseJson.success(map);

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1367,11 +1367,11 @@ public class SubmitServiceImpl implements SubmitService {
          * 自主下单价格低于1000，倒扣500采美豆
          */
         try {
-            if (orderParamBo.getCartType() != 3 && productTotalFee.get() < 1000) {
+            if (orderParamBo.getCartType() != 3 && payTotalFee.get() < 1000) {
                 if (orderParamBo.getUserBeans() < 0) {
                     //设置手动回滚事务
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return ResponseJson.error(-3, "采美豆不足，不能提交订单。建议您前往采美旗下“呵呵商城”小程序购买小额商品。");
+                    return ResponseJson.error(-4, "采美豆不足，不能提交订单。建议您前往采美旗下“呵呵商城”小程序购买小额商品。");
                 } else {
                     //查历史2021.10.27后是否有两个1000以下订单，有return不让下单，没有扣豆子
                     SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -1391,7 +1391,7 @@ public class SubmitServiceImpl implements SubmitService {
                     beansHistory.setPushStatus(0);
                     beansHistory.setAddTime(date);
                     beansHistory.setDelFlag(0);
-                    int beans = orderParamBo.getUserBeans() - 500;
+                    int beans = baseMapper.findBeans(orderParamBo.getUserId()) - 500;
                     productService.updateUserBeans(beansHistory, beans, "【价格低于1000，倒扣500采美豆】");
                 }
             }

src/main/resources/mapper/BaseMapper.xml

@@ -327,4 +327,7 @@
           and type = 2
           and num = 500
     </select>
+    <select id="findBeans" resultType="java.lang.Integer">
+        select userBeans from user where userID=#{userId}
+    </select>
 </mapper>

src/main/resources/mapper/OrderClubMapper.xml

@@ -333,7 +333,6 @@
         <if test="endTime != null and endTime != '' ">
             AND orderTime <![CDATA[<=]]> #{endTime}
         </if>
-        and orderSeen != '2'
         ORDER BY orderTime DESC
     </select>
     <select id="getOrderListByKeyword" resultType="com.caimei365.order.model.vo.OrderVo">
@@ -387,7 +386,6 @@
         LEFT JOIN cm_order_product cop ON co.orderID = cop.orderID
         WHERE co.delFlag = 0 AND co.userID = #{userId}
         AND cop.name LIKE CONCAT('%',#{searchWord},'%')
-        and co.orderSeen != '2'
         GROUP BY co.orderID, co.orderTime
         ORDER BY co.orderTime DESC
     </select>

src/main/resources/mapper/OrderSellerMapper.xml

@@ -9,6 +9,7 @@
     </select>
     <select id="getOrderList" resultType="com.caimei365.order.model.vo.OrderVo">
         SELECT
+        orderSeen,
         orderID AS orderId,
         shopOrderIds,
         orderSource,