接口补充:商家收益记录

src/main/java/org/springblade/modules/api/controller/ApiMerchantUserController.java

@@ -17,6 +17,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DigestUtil;
 import org.springblade.core.tool.utils.WebUtil;
 import org.springblade.modules.api.request.AddChildAccountRequest;
+import org.springblade.modules.api.vo.MerchantIncomeVO;
 import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.auth.utils.TokenUtil;
 import org.springblade.modules.system.entity.User;
@@ -124,4 +125,16 @@ public class ApiMerchantUserController {
         IPage<UserMerchantVO> pages = iUserMerchantService.selectUserMerchantPage(Condition.getPage(query), userMerchant);
         return R.data(pages);
     }
+
+    /**
+     * 我的钱包收益记录
+     */
+    @GetMapping("/pageIncome")
+    @ApiOperationSupport(order = 3)
+    @ApiOperation(value = "我的钱包收益记录-分页", notes = "我的钱包收益记录-分页")
+    public R<IPage<MerchantIncomeVO>> pageIncome(Query query) {
+        IPage<MerchantIncomeVO> pages = iUserMerchantService.pageIncome(Condition.getPage(query), AuthUtil.getUserId());
+        return R.data(pages);
+    }
+
 }

src/main/java/org/springblade/modules/api/vo/MerchantIncomeVO.java

@@ -0,0 +1,90 @@
+package org.springblade.modules.api.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("收益分页返回")
+public class MerchantIncomeVO  {
+
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long orderId;
+    /**
+     * 商品id
+     */
+    @ApiModelProperty(value = "商品id")
+    private Long goodsId;
+    /**
+     * 商品数量
+     */
+    @ApiModelProperty(value = "商品数量")
+    private Integer goodsNum;
+    /**
+     * 商品名称
+     */
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
+    /**
+     * 商品价格
+     */
+    @ApiModelProperty(value = "商品价格")
+    private BigDecimal goodsPrice;
+    /**
+     * 商品图片
+     */
+    @ApiModelProperty(value = "商品图片")
+    private String goodsImage;
+    /**
+     * 商品编号
+     */
+    @ApiModelProperty(value = "商品编号")
+    private String goodsNo;
+    /**
+     * 门店id
+     */
+    @ApiModelProperty(value = "门店id")
+    private Long shopId;
+    /**
+     * 门店名称
+     */
+    @ApiModelProperty(value = "门店名称")
+    private String storeName;
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备id")
+    private Long deviceId;
+    /**
+     * 商家id
+     */
+    @ApiModelProperty(value = "商家id")
+    private Long merchantId;
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+    /**
+     * 货道id
+     */
+    @ApiModelProperty(value = "货道id")
+    private Long cargoWayId;
+    /**
+     * 货道id
+     */
+    @ApiModelProperty(value = "货道编号")
+    private String cargoWayNo;
+    /**
+     * 出货时间
+     */
+    @ApiModelProperty(value = "出货时间")
+    private LocalDateTime shippingTime;
+
+}

src/main/java/org/springblade/modules/system/mapper/UserMerchantMapper.java

@@ -17,6 +17,7 @@
 package org.springblade.modules.system.mapper;
 
 import org.apache.ibatis.annotations.Param;
+import org.springblade.modules.api.vo.MerchantIncomeVO;
 import org.springblade.modules.system.entity.UserMerchant;
 import org.springblade.modules.system.vo.UserMerchantVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,4 +41,6 @@ public interface UserMerchantMapper extends BaseMapper<UserMerchant> {
 	 */
 	List<UserMerchantVO> selectUserMerchantPage(IPage page, @Param("p") UserMerchantVO userMerchant);
 
+	List<MerchantIncomeVO> pageIncome(IPage<MerchantIncomeVO> page, Long userId);
+
 }

src/main/java/org/springblade/modules/system/mapper/UserMerchantMapper.xml

@@ -38,5 +38,8 @@
         </if>
     </select>
 
+    <select id="pageIncome" resultType="org.springblade.modules.api.vo.MerchantIncomeVO">
+        select * from t_order_goods where 1=1
+    </select>
 
 </mapper>

src/main/java/org/springblade/modules/system/service/IUserMerchantService.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.system.service;
 
+import org.springblade.modules.api.vo.MerchantIncomeVO;
 import org.springblade.modules.system.entity.UserMerchant;
 import org.springblade.modules.system.vo.UserMerchantVO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -54,4 +55,12 @@ public interface IUserMerchantService extends IService<UserMerchant> {
 	 */
 	List<Long> getAuthShopId(Long userId);
 
+	/**
+	 * 商家收益记录
+	 * @param page
+	 * @param userId
+	 * @return
+	 */
+    IPage<MerchantIncomeVO> pageIncome(IPage<MerchantIncomeVO> page, Long userId);
+
 }

src/main/java/org/springblade/modules/system/service/impl/UserMerchantServiceImpl.java

@@ -19,6 +19,7 @@ package org.springblade.modules.system.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.modules.api.vo.MerchantIncomeVO;
 import org.springblade.modules.system.entity.UserMerchant;
 import org.springblade.modules.system.mapper.UserMerchantMapper;
 import org.springblade.modules.system.service.IUserMerchantService;
@@ -67,4 +68,9 @@ public class UserMerchantServiceImpl extends ServiceImpl<UserMerchantMapper, Use
 		return ids;
 	}
 
+	@Override
+	public IPage<MerchantIncomeVO> pageIncome(IPage<MerchantIncomeVO> page, Long userId) {
+		return page.setRecords(baseMapper.pageIncome(page, userId));
+	}
+
 }