调整修改

logs/spring-boot-plus-error-2020-09-10.0.log

@@ -0,0 +1,4 @@
+2020-09-10 22:10:19.762 ERROR [http-nio-8888-exec-17] [] i.g.s.handler.GlobalExceptionHandler     244 : 异常来源：ip: 192.168.31.172, path: /api/sysUser/update
+2020-09-10 22:10:19.764 ERROR [http-nio-8888-exec-17] [] i.g.s.handler.GlobalExceptionHandler     76 : errorCode: 5001, errorMessage: 请求参数校验异常:["ID不能为空","手机号码不能为空","角色id不能为空","部门id不能为空"]
+2020-09-10 22:16:49.209 ERROR [http-nio-8888-exec-30] [] i.g.s.handler.GlobalExceptionHandler     244 : 异常来源：ip: 192.168.31.172, path: /api/taShop/update
+2020-09-10 22:16:49.210 ERROR [http-nio-8888-exec-30] [] i.g.s.handler.GlobalExceptionHandler     76 : errorCode: 5001, errorMessage: 请求参数校验异常:["shopId不能为空","店主不能为空","店铺名称不能为空"]

lottery/src/main/java/com/lottery/customer/param/TaCustomerBillPageParam.java

@@ -20,4 +20,9 @@ import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
 @ApiModel(value = "客户账单流水分页参数")
 public class TaCustomerBillPageParam extends BasePageOrderParam {
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
 }

lottery/src/main/java/com/lottery/shop/controller/TaShopController.java

@@ -2,6 +2,7 @@ package com.lottery.shop.controller;
 
 import com.lottery.shop.entity.TaShop;
 import com.lottery.shop.service.TaShopService;
+import com.lottery.shop.vo.TaShopVo;
 import lombok.extern.slf4j.Slf4j;
 import com.lottery.shop.param.TaShopPageParam;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
@@ -76,8 +77,8 @@ public class TaShopController extends BaseController {
     @GetMapping("/info/{id}")
     @OperationLog(name = "店铺 详情", type = OperationLogType.INFO)
     @ApiOperation(value = "店铺 详情", response = TaShop.class)
-    public ApiResult<TaShop> getTaShop(@PathVariable("id") Long id) throws Exception {
-        TaShop taShop = taShopService.getById(id);
+    public ApiResult<TaShopVo> getTaShop(@PathVariable("id") Long id) throws Exception {
+        TaShopVo taShop = taShopService.getShopDetail(id);
         return ApiResult.ok(taShop);
     }
 

lottery/src/main/java/com/lottery/shop/mapper/TaShopMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lottery.shop.entity.TaShop;
 import com.lottery.shop.param.TaShopPageParam;
 
+import com.lottery.shop.vo.TaShopVo;
 import org.springframework.stereotype.Repository;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,4 +22,5 @@ import java.io.Serializable;
 public interface TaShopMapper extends BaseMapper<TaShop> {
 
 
+    TaShopVo getShopDetail(@Param("id") Long id);
 }

lottery/src/main/java/com/lottery/shop/service/TaShopService.java

@@ -2,6 +2,7 @@ package com.lottery.shop.service;
 
 import com.lottery.shop.entity.TaShop;
 import com.lottery.shop.param.TaShopPageParam;
+import com.lottery.shop.vo.TaShopVo;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
 
@@ -58,4 +59,11 @@ public interface TaShopService extends BaseService<TaShop> {
      * @return
      */
     Map<String, Object> getLotteryList(Long id);
+
+    /**
+     * 获取商店详情信息
+     * @param id
+     * @return
+     */
+    TaShopVo getShopDetail(Long id);
 }

lottery/src/main/java/com/lottery/shop/service/impl/TaShopServiceImpl.java

@@ -6,6 +6,7 @@ import com.lottery.shop.mapper.TaShopMapper;
 import com.lottery.shop.service.TaShopService;
 import com.lottery.shop.param.TaShopPageParam;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.lottery.shop.vo.TaShopVo;
 import com.lottery.type.entity.TaShopLottery;
 import com.lottery.type.entity.TdLottery;
 import com.lottery.type.mapper.TaShopLotteryMapper;
@@ -94,4 +95,15 @@ public class TaShopServiceImpl extends BaseServiceImpl<TaShopMapper, TaShop> imp
         return map;
     }
 
+    /**
+     * 获取商店详情信息
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public TaShopVo getShopDetail(Long id) {
+        return taShopMapper.getShopDetail(id);
+    }
+
 }

lottery/src/main/java/com/lottery/shop/vo/TaShopVo.java

@@ -0,0 +1,35 @@
+package com.lottery.shop.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+@Data
+public class TaShopVo {
+
+    @ApiModelProperty("店铺名称")
+    private String name;
+
+    @ApiModelProperty("详细地址")
+    private String address;
+
+    @ApiModelProperty("店主")
+    private Integer keeperName;
+
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+
+    @ApiModelProperty("状态")
+    private Integer status;
+
+    @ApiModelProperty("店主手机号")
+    private String phone;
+
+    @ApiModelProperty("账户余额")
+    private Integer amount;
+}

lottery/src/main/resources/mapper/customer/TaCustomerBillMapper.xml

@@ -9,6 +9,11 @@
         FROM
         ta_customer_bill b
         LEFT JOIN ta_customer c ON b.customer_id = c.customer_id
+        <where>
+            <if test="param.customerId != null and param.customerId != ''">
+                and b.customer_id = #{param.customerId}
+            </if>
+        </where>
     </select>
 
 </mapper>

lottery/src/main/resources/mapper/shop/TaShopMapper.xml

@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lottery.shop.mapper.TaShopMapper">
-
+        <select id="getShopDetail" resultType="com.lottery.shop.vo.TaShopVo">
+                SELECT
+                        t.name,
+                        t.address,
+                        t.create_date,
+                        t.`status`,
+                        s.name as keeper_name,
+                        s.phone,
+                        a.amount
+                FROM
+                ta_shop t
+                LEFT JOIN ta_shopkeeper s ON t.keeper_id = s.keeper_id
+                LEFT JOIN ta_shop_account a ON t.shop_id = a.shop_id
+                WHERE t.shop_id = #{id}
+        </select>
 </mapper>