feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.yunzhi</groupId>
 	<artifactId>niucai-app</artifactId>
-	<version>0.0.3</version>
+	<version>0.0.4</version>
 	<name>niucai</name>
 	<description>Demo project for Spring Boot</description>
 

src/main/java/com/yunzhi/niucai/alipay/AliPayService.java

@@ -4,11 +4,14 @@ package com.yunzhi.niucai.alipay;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
+import com.alipay.api.request.AlipayFundTransUniTransferRequest;
 import com.alipay.api.request.AlipayOpenAuthTokenAppRequest;
 import com.alipay.api.request.AlipayTradeAppPayRequest;
+import com.alipay.api.response.AlipayFundTransUniTransferResponse;
 import com.alipay.api.response.AlipayOpenAuthTokenAppResponse;
 import com.alipay.api.response.AlipayTradeAppPayResponse;
 import com.yunzhi.niucai.alipay.vo.AliPayParam;
+import com.yunzhi.niucai.alipay.vo.AliPayFundTransParam;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;
@@ -70,9 +73,49 @@ public class AliPayService {
         }
     }
 
-    public String getCallbackURL(AlipayTradeAppPayResponse response) {
-        // todo
-        return null;
+    /**
+     * 支付宝转账
+     * https://opendocs.alipay.com/apis/api_28/alipay.fund.trans.uni.transfer
+     * @param fundTransParam
+     * @return
+     * @throws Exception
+     */
+    public boolean FundTrans(AliPayFundTransParam fundTransParam) throws Exception {
+        AlipayFundTransUniTransferRequest request = new AlipayFundTransUniTransferRequest();
+
+        if (null == fundTransParam) {
+            throw new Exception("未找到有效转账信息");
+        }
+
+        if (null == fundTransParam.getPayeeInfo()) {
+            throw new Exception("未找到有效转账收款方信息");
+        }
+
+        if (null == fundTransParam.getProductCode()) {
+            fundTransParam.setProductCode("TRANS_ACCOUNT_NO_PWD");
+        }
+
+        if (null == fundTransParam.getPayeeInfo().getIdentityType()) {
+            fundTransParam.getPayeeInfo().setIdentityType("ALIPAY_LOGON_ID");
+        }
+
+        String content = JSONObject.toJSONString(fundTransParam);
+        request.setBizContent(content);
+
+        try {
+            AlipayFundTransUniTransferResponse response = alipayClient.execute(request);
+            if (response.isSuccess()) {
+                return true;
+            } else {
+                log.error("支付转账提现失败: [{}]:{} \n\t[{}]:{}", response.getCode(), response.getMsg(), response.getSubCode(), response.getSubMsg());
+                throw new Exception(String.format("支付转账提现失败: %s", response.getSubMsg()));
+            }
+        } catch (AlipayApiException e) {
+            log.error("支付转账提现失败: {}", e.getErrMsg());
+            log.error("失败明细： {}", content);
+            e.printStackTrace();
+            throw e;
+        }
     }
 
     /**

src/main/java/com/yunzhi/niucai/alipay/AlipayFactory.java

@@ -1,16 +1,20 @@
 package com.yunzhi.niucai.alipay;
 
+import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.request.AlipaySystemOauthTokenRequest;
+import com.alipay.api.response.AlipaySystemOauthTokenResponse;
 import com.yunzhi.niucai.entity.TaAlipay;
 import com.yunzhi.niucai.service.ITaAlipayService;
-import com.yunzhi.niucai.service.ITaShopAppService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component
 public class AlipayFactory implements InitializingBean {
     private AlipayClient alipayClient;
@@ -21,9 +25,6 @@ public class AlipayFactory implements InitializingBean {
     @Autowired
     private Config config;
 
-    @Autowired
-    ITaShopAppService iTaShopAppService;
-
     @Autowired
     ITaAlipayService iTaAlipayService;
 
@@ -41,6 +42,30 @@ public class AlipayFactory implements InitializingBean {
                 config.getSignType());
     }
 
+    public String getAppID() {
+        return config.getAppid();
+    }
+
+    /**
+     * 获取授权用户ID
+     * @param authCode
+     * @return
+     * @throws Exception
+     */
+    public String getUserId(String authCode) throws Exception {
+        AlipaySystemOauthTokenRequest oauthTokenRequest = new AlipaySystemOauthTokenRequest();
+        oauthTokenRequest.setCode(authCode);
+        oauthTokenRequest.setGrantType("authorization_code");
+        try {
+            AlipaySystemOauthTokenResponse oauthTokenResponse = alipayClient.execute(oauthTokenRequest);
+            return oauthTokenResponse.getUserId();
+        } catch (AlipayApiException e) {
+            log.error("授权支付宝用户信息失败: {}", e.getErrMsg());
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
     @Override
     public void afterPropertiesSet() throws Exception {
         // 写死, 取第一个

src/main/java/com/yunzhi/niucai/alipay/vo/AliPayFundTransParam.java

@@ -0,0 +1,52 @@
+package com.yunzhi.niucai.alipay.vo;
+
+
+import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@ApiModel(description = "支付宝转账参数")
+@Data
+@Accessors(chain = true)
+public class AliPayFundTransParam {
+
+    @ApiModelProperty("商户端的唯一订单号")
+    @JSONField(name = "out_biz_no")
+    String outBizNO;
+
+    @ApiModelProperty("订单总金额，单位为元，精确到小数点后两位")
+    @JSONField(name = "trans_amount")
+    Float transAmount;
+
+    @ApiModelProperty("业务产品码")
+    @JSONField(name = "product_code")
+    String productCode;
+
+    @ApiModelProperty("转账业务的标题，用于在支付宝用户的账单里显示")
+    @JSONField(name = "order_title")
+    String orderTitle;
+
+    @ApiModelProperty("收款方信息")
+    @JSONField(name = "payee_info")
+    PayeeInfo payeeInfo;
+
+    @ApiModel(description = "支付宝转账收款方信息")
+    @Data
+    @Accessors(chain = true)
+    public static class PayeeInfo {
+
+        @ApiModelProperty("唯一标识")
+        @JSONField(name = "identity")
+        String identity;
+
+        @ApiModelProperty("标识类型: 1 ALIPAY_USER_ID 支付宝的会员ID, 2 ALIPAY_LOGON_ID 支付宝登录号 ")
+        @JSONField(name = "identity_type")
+        String identityType;
+
+        @ApiModelProperty("真实姓名")
+        @JSONField(name = "name")
+        String name;
+    }
+}

src/main/java/com/yunzhi/niucai/common/StringUtils.java

@@ -117,4 +117,18 @@ public class StringUtils {
         prefix = prefix.substring(0, padLen);
         return prefix + src;
     }
+
+    public static boolean isNumeric(String str) {
+        if (isEmpty(str)) {
+            return false;
+        }
+
+        try {
+            Double.parseDouble(str.trim());
+        } catch (Exception e) {
+            return false;
+        }
+
+        return true;
+    }
 }

src/main/java/com/yunzhi/niucai/controller/PayController.java

@@ -93,7 +93,7 @@ public class PayController extends BaseController {
                 return ResponseBean.error("生成支付宝交易失败", ResponseBean.ERROR_UNAVAILABLE);
             }
 
-            taOrderPay.setH5CallbackUrl(aliPayService.getCallbackURL(response));
+//            taOrderPay.setH5CallbackUrl(aliPayService.getCallbackURL(response));
         } else {
             // 微信支付
             WxPayParam wxPayParam = new WxPayParam()

src/main/java/com/yunzhi/niucai/controller/TaAlipayController.java

@@ -1,15 +1,29 @@
 package com.yunzhi.niucai.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.yunzhi.niucai.alipay.AlipayFactory;
 import com.yunzhi.niucai.alipay.AliPayService;
 import com.yunzhi.niucai.common.BaseController;
+import com.yunzhi.niucai.common.ResponseBean;
+import com.yunzhi.niucai.common.StringUtils;
+import com.yunzhi.niucai.entity.TaShop;
+import com.yunzhi.niucai.entity.TaShopkeeper;
+import com.yunzhi.niucai.enums.StatusEnum;
+import com.yunzhi.niucai.service.ITaShopService;
+import com.yunzhi.niucai.service.ITaShopkeeperService;
+import com.yunzhi.niucai.vo.AlipayAuthUser;
+import com.yunzhi.niucai.vo.SportDicts;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     *  前端控制器
@@ -19,16 +33,51 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-09-27
  */
 
+@Slf4j
 @Api(tags = "")
 @RestController
 @RequestMapping("/")
 public class TaAlipayController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaAlipayController.class);
-
     @Autowired
     private AlipayFactory alipayFactory;
 
+    @Autowired
+    private ITaShopService iTaShopService;
+
+    @Autowired
+    private ITaShopkeeperService iTaShopkeeperService;
+
+    @GetMapping("/shop/alipay/appid")
+    @ApiOperation(value="获取平台支付宝应用AppID", notes = "获取平台支付宝应用AppID", httpMethod = "GET", response = SportDicts.class)
+    public ResponseBean getPlatAppID() {
+        return ResponseBean.success(alipayFactory.getAppID());
+    }
+
+    @PostMapping("/shop/alipay/auth/user")
+    @ApiOperation(value="绑定支付宝用户", notes = "绑定支付宝用户", httpMethod = "GET", response = SportDicts.class)
+    public ResponseBean authUser(@RequestBody AlipayAuthUser alipayAuthUser,
+                                 HttpServletRequest request) throws Exception {
+        if (null == alipayAuthUser || StringUtils.isEmpty(alipayAuthUser.getAuthCode())) {
+            return ResponseBean.error("未设置授权码", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaShopkeeper taShopkeeper = getShopKeeper(request);
+        if (null == taShopkeeper || StatusEnum.DELETED.getCode().equals(taShopkeeper.getStatus())) {
+            return ResponseBean.error("账户登录状态异常, 请重新登录", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        String aliUserId = alipayFactory.getUserId(alipayAuthUser.getAuthCode());
+        boolean b = iTaShopkeeperService.bindThirdPartId(taShopkeeper, aliUserId, "ali");
+
+        if (b) {
+            taShopkeeper.setIsValidAli(true);
+            iTaShopkeeperService.updateById(taShopkeeper);
+        }
+
+        return b ? ResponseBean.success("success") : ResponseBean.error("授权用户失败", ResponseBean.ERROR_UNAVAILABLE);
+    }
+
     /**
      * 应用授权成功回调
      * @param appId
@@ -42,4 +91,37 @@ public class TaAlipayController extends BaseController {
         AliPayService payService = alipayFactory.getService(-1);
         payService.persistToken(appAuthCode);
     }
+
+    @GetMapping("/app/callback/alipay")
+    public void aliPayCallback(@RequestParam("app_id") String appId,
+                               @RequestParam("msg_app_id") String shopAppId,
+                               @RequestParam("msg_method") String msgMethod,
+                               @RequestParam("biz_content") String content,
+                               HttpServletRequest request) {
+
+        // 转账结果提醒
+        if ("alipay.fund.trans.order.changed".equals(msgMethod)) {
+            try {
+                JSONObject transRes = JSONObject.parseObject(content);
+                String actionType = transRes.getString("action_type");
+                if (StringUtils.isEmpty(actionType)) {
+                    log.error("解析转账结果提醒失败: 内容【{}】", content);
+                    return;
+                }
+
+                // 支付宝有 CREATE-创建, FINISH- 订单处理已完结, CLOSE-超时关闭
+                // 三种提醒
+                if (!"CREATE".equals(actionType)) {
+                    String outBizNO = transRes.getString("out_biz_no");
+                    String status = transRes.getString("status");
+                    String payDate = transRes.getString("pay_date");
+
+                }
+
+            } catch (Exception e) {
+                log.error("解析转账结果提醒失败: {}", e.getMessage());
+                e.printStackTrace();
+            }
+        }
+    }
 }

src/main/java/com/yunzhi/niucai/controller/TaCustomerController.java

@@ -154,23 +154,41 @@ public class TaCustomerController extends BaseController {
 //        }
 //    }
 //
-//    /**
-//     * 修改对象
-//     * @param id  实体ID
-//     * @param taCustomer 实体对象
-//     * @return
-//     */
-//    @RequestMapping(value="/taCustomer/{id}",method= RequestMethod.PUT)
-//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-//    public ResponseBean taCustomerUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-//                                        @ApiParam("更新内容") @RequestBody TaCustomer taCustomer) throws Exception{
-//
-//        if (iTaCustomerService.updateById(taCustomer)){
-//            return ResponseBean.success(iTaCustomerService.getById(id));
-//        }else {
-//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomer 实体对象
+     * @return
+     */
+    @RequestMapping(value="/app/customer/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新客户信息", notes = "更新客户信息", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taCustomerUpdate(@ApiParam("当前客户ID") @PathVariable Integer id,
+                                         @ApiParam("更新内容") @RequestBody TaCustomer taCustomer,
+                                         HttpServletRequest request) throws Exception{
+        TaCustomer customer = getCustomer(request);
+        if (null == customer || StatusEnum.DELETED.getCode().equals(customer.getStatus())) {
+            return ResponseBean.error("校验登录状态出错, 请重新登录", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        if (!customer.getCustomerId().equals(id)) {
+            return ResponseBean.error("不支持更新非当前人员", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        customer.setAvatar(taCustomer.getAvatar());
+        customer.setPhone(taCustomer.getPhone());
+        customer.setName(taCustomer.getName());
+//        customer.setRealName(taCustomer.getRealName());
+        customer.setAlipayUser(taCustomer.getAlipayUser());
+
+        if (iTaCustomerService.updateById(customer)){
+            customer = iTaCustomerService.getById(id);
+            customer.setCashPass(null);
+            customer.setLoginPass(null);
+            return ResponseBean.success(customer);
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 
     /**
      * 根据id查询对象

src/main/java/com/yunzhi/niucai/controller/TaShopController.java

@@ -8,6 +8,7 @@ import com.yunzhi.niucai.common.ResponseBean;
 import com.yunzhi.niucai.entity.TaCustomer;
 import com.yunzhi.niucai.entity.TaShopkeeper;
 import com.yunzhi.niucai.enums.StatusEnum;
+import com.yunzhi.niucai.vo.ShopValidParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -55,6 +56,27 @@ public class TaShopController extends BaseController {
         return ResponseBean.success(result);
     }
 
+
+    @PutMapping("/app/shop/valid")
+    @ApiOperation(value = "认证店铺", notes = "认证店铺", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean updateValidInfo(@RequestBody ShopValidParam shopValidParam,
+                                      HttpServletRequest request) throws Exception {
+        if (null == shopValidParam || null == shopValidParam.getShop() || null == shopValidParam.getShopkeeper() ) {
+            return ResponseBean.error("请设置店铺认证参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaShopkeeper taShopkeeper = getShopKeeper(request);
+        if (null == taShopkeeper || StatusEnum.DELETED.getCode().equals(taShopkeeper.getStatus())) {
+            return ResponseBean.error("当前账户登录状态异常, 请重新登录", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaShop taShop = iTaShopService.getProfileBy(taShopkeeper);
+
+        // 仅替换目前支持的字段
+        ShopValidParam updatedValidInfo = iTaShopService.updateValidInfo(shopValidParam, taShop, taShopkeeper);
+        return ResponseBean.success(updatedValidInfo);
+    }
+
 //    /**
 //     * 分页查询列表
 //     * @param pageNum

src/main/java/com/yunzhi/niucai/controller/TaShopkeeperThirdController.java

@@ -0,0 +1,119 @@
+package com.yunzhi.niucai.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.niucai.common.BaseController;
+import com.yunzhi.niucai.common.ResponseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.yunzhi.niucai.service.ITaShopkeeperThirdService;
+import com.yunzhi.niucai.entity.TaShopkeeperThird;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 店主的第三方账号  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-10-10
+ */
+
+@Api(tags = "店主的第三方账号 ")
+@RestController
+@RequestMapping("/")
+public class TaShopkeeperThirdController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShopkeeperThirdController.class);
+
+    @Autowired
+    public ITaShopkeeperThirdService iTaShopkeeperThirdService;
+
+//
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/taShopkeeperThird",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taShopkeeperThirdList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaShopkeeperThird> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaShopkeeperThird> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaShopkeeperThird> result = iTaShopkeeperThirdService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
+//
+//    /**
+//     * 保存对象
+//     * @param taShopkeeperThird 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taShopkeeperThird",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taShopkeeperThirdAdd(@ApiParam("保存内容") @RequestBody TaShopkeeperThird taShopkeeperThird) throws Exception{
+//
+//        if (iTaShopkeeperThirdService.save(taShopkeeperThird)){
+//            return ResponseBean.success(taShopkeeperThird);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taShopkeeperThird/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taShopkeeperThirdDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaShopkeeperThirdService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taShopkeeperThird 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taShopkeeperThird/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taShopkeeperThirdUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaShopkeeperThird taShopkeeperThird) throws Exception{
+//
+//        if (iTaShopkeeperThirdService.updateById(taShopkeeperThird)){
+//            return ResponseBean.success(iTaShopkeeperThirdService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+//
+//    /**
+//     * 根据id查询对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taShopkeeperThird/{id}",method= RequestMethod.GET)
+//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taShopkeeperThirdGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        return ResponseBean.success(iTaShopkeeperThirdService.getById(id));
+//    }
+}

src/main/java/com/yunzhi/niucai/entity/TaCustomer.java

@@ -114,5 +114,13 @@ public class TaCustomer implements Serializable {
      */
     private Integer recChannel;
 
+    /**
+     * 支付宝账号
+     */
+    private String alipayUser;
 
+    /**
+     * 微信openid
+     */
+    private String wxOpenid;
 }

src/main/java/com/yunzhi/niucai/entity/TaCustomerBetting.java

@@ -78,8 +78,11 @@ public class TaCustomerBetting implements Serializable {
     @ApiModelProperty(value = "预期收益")
     private String expectedEarning;
 
-    @ApiModelProperty(value = "是否打单")
-    private Boolean isPrinted;
+    @ApiModelProperty(value = "是否出票")
+    private Boolean isDrawn;
+
+    @ApiModelProperty(value = "出票时间")
+    private LocalDateTime drawnDate;
 
     @ApiModelProperty(value = "彩票图片")
     private String lotteryPicture;

src/main/java/com/yunzhi/niucai/entity/TaCustomerBettingSport.java

@@ -49,7 +49,7 @@ public class TaCustomerBettingSport implements Serializable {
     private String oddsOrdered;
 
     @ApiModelProperty(value = "打单赔率")
-    private String oddsPrinted;
+    private String oddsDrawn;
 
     @ApiModelProperty(value = "是否中奖")
     private Boolean isWinning;

src/main/java/com/yunzhi/niucai/entity/TaShop.java

@@ -92,6 +92,11 @@ public class TaShop implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 营业执照
+     */
+    private String businessLicense;
+
     /**
      * 彩种
      */

src/main/java/com/yunzhi/niucai/entity/TaShopkeeper.java

@@ -48,5 +48,15 @@ public class TaShopkeeper implements Serializable {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "是否支付宝会员认证")
+    private Boolean isValidAli;
 
+    @ApiModelProperty(value = "身份证正面")
+    private String frontIdCard;
+
+    @ApiModelProperty(value = "身份证反面")
+    private String backIdCard;
+
+    @ApiModelProperty(value = "身份证号码")
+    private String idCard;
 }

src/main/java/com/yunzhi/niucai/entity/TaShopkeeperThird.java

@@ -0,0 +1,58 @@
+package com.yunzhi.niucai.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 店主的第三方账号 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-10-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaShopkeeperThird对象", description="店主的第三方账号 ")
+public class TaShopkeeperThird implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "第三方类型 wx微信,ali支付宝")
+    private String thirdPartType;
+
+    @ApiModelProperty(value = "第三方ID")
+    private String thirdPartId;
+
+    @ApiModelProperty(value = "店主ID")
+    private Integer keeperId;
+
+    @ApiModelProperty(value = "昵称")
+    private String nickName;
+
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "性别 1男2女9未知")
+    private Integer sex;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "状态")
+    private Boolean status;
+
+
+}

src/main/java/com/yunzhi/niucai/entity/TdCity.java

@@ -25,9 +25,9 @@ public class TdCity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-//    @TableId(value = "id", type = IdType.INPUT)
-//    @ApiModelProperty(value = "主键")
-//    private Integer id;
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "主键")
+    private Integer areaId;
 
     @ApiModelProperty(value = "省市区名称")
     private String name;

src/main/java/com/yunzhi/niucai/mapper/TaShopMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,4 +38,12 @@ public interface TaShopMapper extends BaseMapper<TaShop> {
                                  @Param("lat") String lat,
                                  @Param("notIn") List<Integer> notIn,
                                  @Param("limit") int limit);
+
+    /**
+     * 获取店铺相关信息
+     * @param shopId
+     * @return
+     * @throws Exception
+     */
+    Map<String, Object> getSummeryById(@Param("shopId") Integer shopId) throws Exception;
 }

src/main/java/com/yunzhi/niucai/mapper/TaShopkeeperThirdMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.niucai.mapper;
+
+import com.yunzhi.niucai.entity.TaShopkeeperThird;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 店主的第三方账号  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-10-10
+ */
+@Mapper
+public interface TaShopkeeperThirdMapper extends BaseMapper<TaShopkeeperThird> {
+
+}

src/main/java/com/yunzhi/niucai/service/ITaOrderService.java

@@ -27,4 +27,6 @@ public interface ITaOrderService extends IService<TaOrder> {
     boolean drawOrder(TaOrder taOrder, DrawOrderParam drawOrderParam) throws Exception;
 
     TaOrder getByOutTradeNo(String outTradeNo);
+
+    TaOrder getByBetting(TaCustomerBetting betting) throws Exception;
 }

src/main/java/com/yunzhi/niucai/service/ITaShopService.java

@@ -1,10 +1,12 @@
 package com.yunzhi.niucai.service;
 
 import com.yunzhi.niucai.entity.TaCustomer;
+import com.yunzhi.niucai.entity.TaOrder;
 import com.yunzhi.niucai.entity.TaShop;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.niucai.entity.TaShopkeeper;
 import com.yunzhi.niucai.vo.ShopKeeperSignUp;
+import com.yunzhi.niucai.vo.ShopValidParam;
 
 import java.util.Map;
 
@@ -33,4 +35,8 @@ public interface ITaShopService extends IService<TaShop> {
     TaShop getProfileBy(TaShopkeeper shopkeeper) throws Exception;
 
     boolean createBy(TaShopkeeper shopkeeper, ShopKeeperSignUp signUpParam) throws Exception;
+
+    ShopValidParam updateValidInfo(ShopValidParam shopValidParam, TaShop taShop, TaShopkeeper taShopkeeper) throws Exception;
+
+    Map<String, Object> getSummeryByOrder(TaOrder taOrder) throws Exception;
 }

src/main/java/com/yunzhi/niucai/service/ITaShopkeeperService.java

@@ -15,4 +15,6 @@ import com.yunzhi.niucai.vo.ShopKeeperSignUp;
 public interface ITaShopkeeperService extends IService<TaShopkeeper> {
 
     boolean signUp(ShopKeeperSignUp signUpParam) throws Exception;
+
+    boolean bindThirdPartId(TaShopkeeper taShopkeeper, String thirdPartId, String thirdPartType) throws Exception;
 }

src/main/java/com/yunzhi/niucai/service/ITaShopkeeperThirdService.java

@@ -0,0 +1,18 @@
+package com.yunzhi.niucai.service;
+
+import com.yunzhi.niucai.entity.TaShopkeeper;
+import com.yunzhi.niucai.entity.TaShopkeeperThird;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 店主的第三方账号  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-10-10
+ */
+public interface ITaShopkeeperThirdService extends IService<TaShopkeeperThird> {
+
+    TaShopkeeperThird getByKeeper(TaShopkeeper taShopkeeper, String thirdPartType) throws Exception;
+}

src/main/java/com/yunzhi/niucai/service/ITdCityService.java

@@ -13,5 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITdCityService extends IService<TdCity> {
 
-    Integer getIdByLevel(String province, int levelType) throws Exception;
+    TdCity getByLevel(String name, int level) throws Exception;
 }

src/main/java/com/yunzhi/niucai/service/impl/TaCustomerBettingServiceImpl.java

@@ -9,6 +9,8 @@ import com.yunzhi.niucai.mapper.TaCustomerBettingSportMapper;
 import com.yunzhi.niucai.service.ITaBettingPlanService;
 import com.yunzhi.niucai.service.ITaCustomerBettingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.niucai.service.ITaOrderService;
+import com.yunzhi.niucai.service.ITaShopService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,6 +33,12 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
     @Autowired
     ITaBettingPlanService iTaBettingPlanService;
 
+    @Autowired
+    ITaOrderService iTaOrderService;
+
+    @Autowired
+    ITaShopService iTaShopService;
+
     @Autowired
     TaCustomerBettingItemMapper taCustomerBettingItemMapper;
 
@@ -56,7 +64,7 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
         taCustomerBetting.setNotesNum(plan.getNotesNum());
         taCustomerBetting.setTotalPrice(plan.getTotalPrice());
         taCustomerBetting.setExpectedEarning(plan.getExpectedEarning());
-        taCustomerBetting.setIsPrinted(false);
+        taCustomerBetting.setIsDrawn(false);
         taCustomerBetting.setIsOpen(false);
         taCustomerBetting.setIsWinning(false);
         taCustomerBetting.setStatus(StatusEnum.READY.getCode());
@@ -114,9 +122,17 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
         // 查询方案
         TaBettingPlan taBettingPlan = iTaBettingPlanService.getDetailOfPlanById(betting.getPlanId());
 
+        // 订单查询
+        TaOrder taOrder = iTaOrderService.getByBetting(betting);
+
+        // 投注店铺信息
+        Map<String, Object> shop = iTaShopService.getSummeryByOrder(taOrder);
+
         Map<String, Object> result = new HashMap<>();
         result.put("betting", betting);
         result.put("plan", taBettingPlan);
+        result.put("order", taOrder);
+        result.put("shop", shop);
 
         return result;
     }

src/main/java/com/yunzhi/niucai/service/impl/TaMatchServiceImpl.java

@@ -284,7 +284,7 @@ public class TaMatchServiceImpl extends ServiceImpl<TaMatchMapper, TaMatch> impl
             List<String> oddsOfNote = new ArrayList<>();
             for (TaCustomerBettingSport sportItem : sportList) {
                 if (sportItem.getIsWinning()) {
-                    oddsOfNote.add(sportItem.getOddsPrinted());
+                    oddsOfNote.add(sportItem.getOddsDrawn());
                 } else {
                     // 未中奖的赔率是 0
                     oddsOfNote.add("0");

src/main/java/com/yunzhi/niucai/service/impl/TaOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.niucai.common.CommConstants;
 import com.yunzhi.niucai.common.DateUtils;
@@ -114,11 +115,11 @@ public class TaOrderServiceImpl extends ServiceImpl<TaOrderMapper, TaOrder> impl
             throw new Exception("未找到有效的投注记录");
         }
 
-        if (customerBetting.getIsPrinted()) {
+        if (customerBetting.getIsDrawn()) {
             throw new Exception("已经出票, 无需操作");
         }
 
-        customerBetting.setIsPrinted(true);
+        customerBetting.setIsDrawn(true);
         customerBetting.setLotteryPicture(drawOrderParam.getLotteryPicture());
 
         return iTaCustomerBettingService.updateById(customerBetting);
@@ -129,6 +130,17 @@ public class TaOrderServiceImpl extends ServiceImpl<TaOrderMapper, TaOrder> impl
         return taOrderMapper.getByOutTradeNo(outTradeNo);
     }
 
+    @Override
+    public TaOrder getByBetting(TaCustomerBetting betting) throws Exception {
+        QueryWrapper<TaOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("betting_id", betting.getBettingId());
+        queryWrapper.gt("status", StatusEnum.DELETED.getCode());
+
+        TaOrder taOrder = getOne(queryWrapper);
+
+        return taOrder;
+    }
+
     private String nextOrderNo(String prefix, int length, boolean padDate) throws Exception {
         List<String> parts = new ArrayList<>();
         parts.add(prefix);

src/main/java/com/yunzhi/niucai/service/impl/TaShopServiceImpl.java

@@ -5,19 +5,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.niucai.common.ResponseBean;
 import com.yunzhi.niucai.common.StringUtils;
-import com.yunzhi.niucai.entity.TaCustomer;
-import com.yunzhi.niucai.entity.TaShop;
-import com.yunzhi.niucai.entity.TaShopLottery;
-import com.yunzhi.niucai.entity.TaShopkeeper;
+import com.yunzhi.niucai.entity.*;
 import com.yunzhi.niucai.enums.StatusEnum;
 import com.yunzhi.niucai.mapper.TaShopMapper;
 import com.yunzhi.niucai.service.ITaShopLotteryService;
 import com.yunzhi.niucai.service.ITaShopService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.niucai.service.ITaShopkeeperService;
 import com.yunzhi.niucai.service.ITdCityService;
 import com.yunzhi.niucai.vo.ShopKeeperSignUp;
+import com.yunzhi.niucai.vo.ShopValidParam;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,6 +39,9 @@ public class TaShopServiceImpl extends ServiceImpl<TaShopMapper, TaShop> impleme
     @Autowired
     ITaShopLotteryService iTaShopLotteryService;
 
+    @Autowired
+    ITaShopkeeperService iTaShopkeeperService;
+
     @Autowired
     ITdCityService iTdCityService;
 
@@ -118,20 +122,25 @@ public class TaShopServiceImpl extends ServiceImpl<TaShopMapper, TaShop> impleme
         // 校验店主
         // 是否允许店主唯一, 业务暂时没有说明, 所以先不做校验
 
-        Integer provinceId = iTdCityService.getIdByLevel(signUpParam.getProvince(), 1);
-        if (null == provinceId) {
+        TdCity province = iTdCityService.getByLevel(signUpParam.getProvince(), 1);
+        if (null == province) {
             throw new Exception("未找到匹配的省份信息");
         }
+        Integer provinceId = province.getAreaId();
 
         // 地级市
-        Integer cityId = iTdCityService.getIdByLevel(signUpParam.getCity(), 2);
-        if (null == cityId) {
-            // 县级市
-            cityId = iTdCityService.getIdByLevel(signUpParam.getCity(), 3);
-            if (null == cityId) {
+        TdCity city = iTdCityService.getByLevel(signUpParam.getCity(), 2);
+        if (null == city) {
+            city = iTdCityService.getByLevel(signUpParam.getCity(), 3);
+            if (null == city) {
                 throw new Exception("未找到匹配的城市信息");
             }
         }
+        Integer cityId = city.getAreaId();
+
+        if (!city.getParentid().equals(provinceId)) {
+            throw new Exception("内部映射店铺地址出错");
+        }
 
         if (StringUtils.isEmpty(signUpParam.getLng()) || StringUtils.isEmpty(signUpParam.getLat())) {
             throw new Exception("请设置店铺经纬度");
@@ -152,4 +161,65 @@ public class TaShopServiceImpl extends ServiceImpl<TaShopMapper, TaShop> impleme
 
         return save(taShop);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ShopValidParam updateValidInfo(ShopValidParam shopValidParam, TaShop taShop, TaShopkeeper taShopkeeper) throws Exception {
+
+        // 店铺
+        taShop.setName(shopValidParam.getShop().getName());
+        taShop.setBusinessLicense(shopValidParam.getShop().getBusinessLicense());
+        taShop.setLat(shopValidParam.getShop().getLat());
+        taShop.setLng(shopValidParam.getShop().getLng());
+        taShop.setAddress(shopValidParam.getShop().getAddress());
+
+        if (!StringUtils.isNumeric(shopValidParam.getShop().getProvinceId())) {
+            TdCity province = iTdCityService.getByLevel(shopValidParam.getShop().getProvinceId(), 1);
+            if (null != province) {
+                taShop.setProvinceId(province.getAreaId().toString());
+            }
+        }
+
+        if (!StringUtils.isNumeric(shopValidParam.getShop().getCityId())) {
+            TdCity city = iTdCityService.getByLevel(shopValidParam.getShop().getCityId(), 2);
+            if (null == city) {
+                city = iTdCityService.getByLevel(shopValidParam.getShop().getCityId(), 3);
+            }
+
+            if (null != city) {
+                taShop.setCityId(city.getAreaId().toString());
+            }
+        }
+
+        if (!updateById(taShop)) {
+            throw new Exception("更新店铺信息失败");
+        }
+
+        // 店主
+        taShopkeeper.setName(shopValidParam.getShopkeeper().getName());
+        taShopkeeper.setPhone(shopValidParam.getShopkeeper().getPhone());
+        taShopkeeper.setPassword(null); // 不更新
+
+        if (!StringUtils.isEmpty(shopValidParam.getShopkeeper().getFrontIdCard())) {
+            taShopkeeper.setFrontIdCard(shopValidParam.getShopkeeper().getFrontIdCard());
+            taShopkeeper.setBackIdCard(shopValidParam.getShopkeeper().getBackIdCard());
+        }
+
+        if (!iTaShopkeeperService.updateById(taShopkeeper)) {
+            throw new Exception("更新店主信息失败");
+        }
+
+        shopValidParam.setShop(taShop);
+        shopValidParam.setShopkeeper(taShopkeeper);
+        return shopValidParam;
+    }
+
+    @Override
+    public Map<String, Object> getSummeryByOrder(TaOrder taOrder) throws Exception {
+        if (null == taOrder || null == taOrder.getShopId()) {
+            return null;
+        }
+
+        return taShopMapper.getSummeryById(taOrder.getShopId());
+    }
 }

src/main/java/com/yunzhi/niucai/service/impl/TaShopkeeperServiceImpl.java

@@ -3,14 +3,17 @@ package com.yunzhi.niucai.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.niucai.common.EncryptUtils;
 import com.yunzhi.niucai.entity.TaShopkeeper;
+import com.yunzhi.niucai.entity.TaShopkeeperThird;
 import com.yunzhi.niucai.enums.StatusEnum;
 import com.yunzhi.niucai.mapper.TaShopkeeperMapper;
 import com.yunzhi.niucai.service.ITaShopService;
 import com.yunzhi.niucai.service.ITaShopkeeperService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.niucai.service.ITaShopkeeperThirdService;
 import com.yunzhi.niucai.vo.ShopKeeperSignUp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -26,6 +29,9 @@ public class TaShopkeeperServiceImpl extends ServiceImpl<TaShopkeeperMapper, TaS
     @Autowired
     ITaShopService iTaShopService;
 
+    @Autowired
+    ITaShopkeeperThirdService iTaShopkeeperThirdService;
+
     @Override
     public boolean signUp(ShopKeeperSignUp signUpParam) throws Exception {
         // 校验手机号唯一
@@ -52,6 +58,21 @@ public class TaShopkeeperServiceImpl extends ServiceImpl<TaShopkeeperMapper, TaS
         return iTaShopService.createBy(shopkeeper, signUpParam);
     }
 
+    @Override
+    public boolean bindThirdPartId(TaShopkeeper taShopkeeper, String thirdPartId, String thirdPartType) throws Exception {
+        TaShopkeeperThird taShopkeeperThird = iTaShopkeeperThirdService.getByKeeper(taShopkeeper, thirdPartType);
+        if (null == taShopkeeperThird) {
+            taShopkeeperThird = new TaShopkeeperThird();
+            taShopkeeperThird.setThirdPartType(thirdPartType);
+            taShopkeeperThird.setKeeperId(taShopkeeper.getKeeperId());
+            taShopkeeperThird.setThirdPartId(thirdPartId);
+            return iTaShopkeeperThirdService.save(taShopkeeperThird);
+        } else {
+            taShopkeeperThird.setThirdPartId(thirdPartId);
+            return iTaShopkeeperThirdService.updateById(taShopkeeperThird);
+        }
+    }
+
     public TaShopkeeper getByPhone(String phone) {
         QueryWrapper<TaShopkeeper> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", phone);

src/main/java/com/yunzhi/niucai/service/impl/TaShopkeeperThirdServiceImpl.java

@@ -0,0 +1,36 @@
+package com.yunzhi.niucai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.niucai.entity.TaShopkeeper;
+import com.yunzhi.niucai.entity.TaShopkeeperThird;
+import com.yunzhi.niucai.enums.StatusEnum;
+import com.yunzhi.niucai.mapper.TaShopkeeperThirdMapper;
+import com.yunzhi.niucai.service.ITaShopkeeperThirdService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 店主的第三方账号  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-10-10
+ */
+@Service
+public class TaShopkeeperThirdServiceImpl extends ServiceImpl<TaShopkeeperThirdMapper, TaShopkeeperThird> implements ITaShopkeeperThirdService {
+
+    @Override
+    public TaShopkeeperThird getByKeeper(TaShopkeeper taShopkeeper, String thirdPartType) throws Exception {
+        if (null == taShopkeeper || StatusEnum.DELETED.getCode().equals(taShopkeeper.getStatus())) {
+            throw new Exception("未找到有效的店主信息");
+        }
+
+        QueryWrapper<TaShopkeeperThird> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("keeper_id", taShopkeeper.getKeeperId());
+        queryWrapper.eq("third_part_type", thirdPartType);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+
+        return getOne(queryWrapper);
+    }
+}

src/main/java/com/yunzhi/niucai/service/impl/TdCityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.niucai.entity.TdCity;
 import com.yunzhi.niucai.mapper.TdCityMapper;
 import com.yunzhi.niucai.service.ITdCityService;
@@ -18,8 +19,11 @@ import org.springframework.stereotype.Service;
 public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> implements ITdCityService {
 
     @Override
-    public Integer getIdByLevel(String province, int levelType) throws Exception {
-        // todo
-        return null;
+    public TdCity getByLevel(String name, int level) throws Exception {
+        QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like("name", name);
+        queryWrapper.eq("leveltype", level);
+
+        return getOne(queryWrapper);
     }
 }

src/main/java/com/yunzhi/niucai/vo/AlipayAuthUser.java

@@ -0,0 +1,14 @@
+package com.yunzhi.niucai.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "支付宝用户授权")
+@Data
+public class AlipayAuthUser {
+
+    @ApiModelProperty("授权码")
+    String authCode;
+}

src/main/java/com/yunzhi/niucai/vo/ShopValidParam.java

@@ -0,0 +1,19 @@
+package com.yunzhi.niucai.vo;
+
+
+import com.yunzhi.niucai.entity.TaShop;
+import com.yunzhi.niucai.entity.TaShopkeeper;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "店铺认证参数")
+@Data
+public class ShopValidParam {
+
+    @ApiModelProperty("店铺信息")
+    TaShop shop;
+
+    @ApiModelProperty("店主信息")
+    TaShopkeeper shopkeeper;
+}

src/main/resources/application.yml

@@ -10,6 +10,8 @@ interceptor:
     enable: true
     include-paths: /**
     exclude-paths:
+      - /app/sms/**
+      - /shop/sms/**
       - /app/login
       - /app/logout
       - /app/signup

src/main/resources/mapper/TaShopMapper.xml

@@ -62,4 +62,15 @@
             fn_distance ( t.lng, t.lat, #{lng}, #{lat} ) DESC
         LIMIT #{limit}
     </select>
+    <select id="getSummeryById" resultType="java.util.Map">
+        SELECT
+            t.`name`,
+            s.`name` AS keeperName,
+            s.phone AS keeperPhone
+        FROM
+        ta_shop t
+        INNER JOIN ta_shopkeeper s ON t.keeper_id = s.keeper_id
+        WHERE
+            t.shop_id = #{shopId}
+    </select>
 </mapper>

src/main/resources/mapper/TaShopkeeperThirdMapper.xml

@@ -0,0 +1,5 @@
+<?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.yunzhi.niucai.mapper.TaShopkeeperThirdMapper">
+
+</mapper>