MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -5127,7 +5127,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
         List<UserOrderGoodsListVo> goodsList = baseMapper.getUserOrderGoodsList(user.getUserId());
         if (CollectionUtils.isNotEmpty(goodsList)) {
-            vo.setGoodsNames(goodsList.stream().limit(3).map(UserOrderGoodsListVo::getCategoryName).collect(Collectors.toList()));
+            vo.setGoodsNames(goodsList.stream().limit(10).map(UserOrderGoodsListVo::getCategoryName).collect(Collectors.toList()));
         }
 
         //缓存用户信息key

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -4217,6 +4217,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     List<TopRefundUserVo> collect = v.stream().map(item -> {
                         TopRefundUserVo topRefundUserVo = new TopRefundUserVo();
                         topRefundUserVo.setRefundFee(item.getRefundFee());
+                        topRefundUserVo.setRealRefundFee(item.getRealRefundFee());
                         topRefundUserVo.setRefundReason(item.getApplyReason());
                         topRefundUserVo.setOrderSn(orderSn);
                         if (item.getRefundType() == 1) {
@@ -4231,6 +4232,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                             String businessName = goodsService.getBusinessName(item.getGoodsId());
                             topRefundUserVo.setBusinessName(businessName);
                             topRefundUserVo.setGoodsYear(g.getSevenYear());
+                            topRefundUserVo.setGoodsPrice(g.getStandPrice());
                         } else {
                             TopOldOrderGoods orderGoods = topOrderGoodsService.getById(item.getOrderGoodsId());
                             topRefundUserVo.setUserName(orderGoods.getUserName());
@@ -4238,6 +4240,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                             topRefundUserVo.setBusinessName(orderGoods.getBusinessFullName());
                             topRefundUserVo.setGoodsName(orderGoods.getGoodsName());
                             topRefundUserVo.setGoodsYear(orderGoods.getGoodsYear());
+                            topRefundUserVo.setGoodsPrice(orderGoods.getGoodsPrice());
                         }
                         topRefundUserVo.setRefundSn(item.getRefundSn());
                         return topRefundUserVo;
@@ -4255,6 +4258,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             List<TopRefundUserVo> collect = refunds.stream().map(item -> {
                 TopRefundUserVo topRefundUserVo = new TopRefundUserVo();
                 topRefundUserVo.setRefundFee(item.getRefundFee());
+                topRefundUserVo.setRealRefundFee(item.getRealRefundFee());
                 topRefundUserVo.setRefundReason(item.getApplyReason());
                 topRefundUserVo.setOrderSn(orderSn);
                 if (item.getRefundType() == 1) {
@@ -4269,6 +4273,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     String businessName = goodsService.getBusinessName(item.getGoodsId());
                     topRefundUserVo.setBusinessName(businessName);
                     topRefundUserVo.setGoodsYear(g.getSevenYear());
+                    topRefundUserVo.setGoodsPrice(g.getStandPrice());
                 } else {
                     TopOldOrderGoods orderGoods = topOrderGoodsService.getById(item.getOrderGoodsId());
                     topRefundUserVo.setUserName(orderGoods.getUserName());
@@ -4276,6 +4281,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     topRefundUserVo.setBusinessName(orderGoods.getBusinessFullName());
                     topRefundUserVo.setGoodsName(orderGoods.getGoodsName());
                     topRefundUserVo.setGoodsYear(orderGoods.getGoodsYear());
+                    topRefundUserVo.setGoodsPrice(orderGoods.getGoodsPrice());
                 }
                 topRefundUserVo.setRefundSn(item.getRefundSn());
                 return topRefundUserVo;
@@ -4307,7 +4313,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             vo.setOpeningName(oldOrder.getOpeningName());
         }
         //审核进度
-        List<TopOldOrderCheckLog> checkLogs = topOldOrderCheckLogService
+            List<TopOldOrderCheckLog> checkLogs = topOldOrderCheckLogService
                 .list(new LambdaQueryWrapper<TopOldOrderCheckLog>()
                         .eq(TopOldOrderCheckLog::getRefundSn, vo.getRefundSn())
                         .eq(TopOldOrderCheckLog::getStatus, 1)

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopRefundUserVo.java

@@ -35,9 +35,15 @@ public class TopRefundUserVo {
     @ApiModelProperty("学员身份证")
     private String userCard;
 
+    @ApiModelProperty("商品标准价格")
+    private BigDecimal goodsPrice;
+
     @ApiModelProperty("退款金额")
     private BigDecimal refundFee;
 
+    @ApiModelProperty("实际退款金额")
+    private BigDecimal realRefundFee;
+
     @ApiModelProperty("退款理由")
     private String refundReason;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderCustomerVo.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
 public class TopOrderCustomerVo implements Serializable {
 
     @ApiModelProperty("客户ID")
-    private Long customerId;
+    private String customerId;
 
     @ApiModelProperty("客户名称")
     private String customerName;

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml

@@ -118,7 +118,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND #{applyStartTime} >= oi.apply_time
         </if>
         <if test="searchKey != null and searchKey != ''">
-            and (u.realname like concat('%', #{searchKey}, '%') or u.id_card like concat('%', #{searchKey}, '%') or oi.invoice_code like concat('%', #{searchKey}, '%') or u.invoice_num like concat('%', #{searchKey}, '%'))
+            and (
+            u.realname like concat('%', #{searchKey}, '%')
+            or u.id_card like concat('%', #{searchKey}, '%')
+            or oi.invoice_code like concat('%', #{searchKey}, '%')
+            or (SELECT COUNT(oio.id) FROM order_invoice_order oio
+            LEFT JOIN order_goods og ON oio.order_goods_id = og.order_goods_id WHERE oio.invoice_id = oi.invoice_id AND og.order_sn = #{searchKey}) > 0
+            )
         </if>
         ORDER BY oi.invoice_id DESC
     </select>