java/qijisheng.git

			@@ -38,7 +38,18 @@
			@ApiModelProperty(value = "门店id")
			@TableField("shop_id")
			private Integer shopId;

			@ApiModelProperty(value = "门店名称")
			@TableField(exist = false)
			@Excel(name = "门店名称")
			private String shopName;
			@ApiModelProperty(value = "店长名称")
			@TableField(exist = false)
			@Excel(name = "店长姓名")
			private String shopManagerName;
			@ApiModelProperty(value = "联系电话")
			@TableField(exist = false)
			@Excel(name = "联系电话")
			private String phone;
			@ApiModelProperty(value = "变动类型（1=绑定门店分佣,2=下级门店分佣,3=核销门店服务费，4=提现）")
			@TableField("type")
			@Excel(name = "变更类型",readConverterExp = "1=绑定门店分佣,2=下级门店分佣,3=核销门店服务费,4=提现")
			@@ -51,6 +62,10 @@
			@ApiModelProperty(value = "变动金额")
			@TableField("variable_amount")
			private BigDecimal variableAmount;
			@ApiModelProperty(value = "变动时间")
			@TableField("create_time")
			@Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime createTime;
			@ApiModelProperty(value = "变动金额")
			@TableField(exist = false)
			@Excel(name = "变更数量")
			@@ -60,10 +75,7 @@
			@TableField("balance")
			private BigDecimal balance;

			@ApiModelProperty(value = "变动时间")
			@TableField("create_time")
			@Excel(name = "变更时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime createTime;


			@ApiModelProperty(value = "变动用户id")
			@TableField("create_user_id")
			@@ -73,20 +85,11 @@
			@TableField("object_id")
			private Long objectId;

			@ApiModelProperty(value = "门店名称")
			@TableField(exist = false)
			@Excel(name = "门店名称")
			private String shopName;

			@ApiModelProperty(value = "店长名称")
			@TableField(exist = false)
			@Excel(name = "店长名称")
			private String shopManagerName;

			@ApiModelProperty(value = "联系电话")
			@TableField(exist = false)
			@Excel(name = "联系电话")
			private String phone;




			@ApiModelProperty(value = "开始时间")
			@TableField(exist = false)

			@@ -652,7 +652,7 @@

			@GetMapping("/detail")
			@ApiOperation(value = "用户列表-详情", tags = {"管理后台"})
			public R<AppUser> detail(Long id) {
			public R<AppUser> detail(Long id,Integer shopId) {

			Long userid = tokenService.getLoginUser().getUserid();
			SysUser sysUser = sysUserClient.getSysUser(userid).getData();
			@@ -686,7 +686,7 @@
			List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list();
			byId.setBottomUsers(list);
			//消费总金额
			R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,byId.getShopId());
			R<List<Order>> orderR = remoteOrderGoodsClient.byShopIdAndUserId(id,shopId);
			List<Order> orderList = orderR.getData();
			if (!CollectionUtils.isEmpty(orderList)){
			BigDecimal paymentAmount = orderList.stream().map(Order::getPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);

			@@ -52,6 +52,7 @@
			and tbcr.change_type = #{changeRecord.changeType}
			</if>
			</where>
			order by tbcr.create_time desc
			</sql>

			<select id="selectBalanceChangeRecordList" resultType="com.ruoyi.account.api.model.BalanceChangeRecord">

	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/ShopBalanceStatement.java	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-account/src/main/resources/mapper/account/BalanceChangeRecordMapper.xml	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史