feats

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

@@ -2,6 +2,8 @@ package com.yunzhi.niucai.common;
 
 import org.springframework.util.DigestUtils;
 
+import java.util.Random;
+
 public class EncryptUtils {
 
     public static String md5(String str, String ...slats) {
@@ -14,4 +16,14 @@ public class EncryptUtils {
         String md5 = DigestUtils.md5DigestAsHex(base.getBytes());
         return md5;
     }
+
+    public static String randDigitStr(int length) {
+        Random random = new Random();
+        String res = "";
+        for (int i = 0; i < length; i ++) {
+            int num = random.nextInt(10);
+            res += String.valueOf(num);
+        }
+        return res;
+    }
 }

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

@@ -0,0 +1,141 @@
+package com.yunzhi.niucai.common;
+
+import com.yunzhi.niucai.config.SMSConfig;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Hashtable;
+import java.util.Random;
+
+@Slf4j
+@Component
+@EnableScheduling
+public class SMSCaptcha {
+    @Autowired
+    SMSConfig smsConfig;
+
+    @Autowired
+    SMSUtils smsUtils;
+
+    // 缓存电话列表
+    Hashtable<String, Phone> allPhones = new Hashtable<>();
+
+    /**
+     * 发送验证码
+     * @param tel
+     * @param captcha
+     * @throws Exception
+     */
+    public void send(String tel, String captcha) throws Exception {
+        if (null == captcha) {
+            throw new Exception("没有有效的验证码");
+        }
+
+        Phone phone = new Phone()
+                .setNumber(tel)
+                .setCaptcha(captcha)
+                .setExpire(expireTime());
+
+
+        SMSUtils.Message message = new SMSUtils.Message()
+                .setCode(smsConfig.getCaptcha().getCode())
+                .setTel(tel)
+                .setParams(new String[]{ captcha, smsConfig.getCaptcha().getSign() });
+
+        try {
+            smsUtils.sendMessage(message);
+        } catch (Exception e) {
+            // 修改友好点的错误
+            throw new Exception("发送验证码失败");
+        }
+
+        log.info(String.format("发送验证码 %s 到手机 %s", captcha, tel));
+
+        // 发送成功, 写入缓存
+        toCache(phone);
+    }
+
+    /**
+     * 校验验证码
+     * @param tel
+     * @param captcha
+     * @return
+     */
+    public boolean validate(String tel, String captcha) {
+        Phone phone = fromCache(tel);
+        if (null == phone) {
+            return false;
+        }
+
+        if (null == captcha || !captcha.equals(phone.getCaptcha())) {
+            return false;
+        }
+
+        // 过期则清除缓存
+        boolean res = checkExpire(phone);
+        if (res) {
+            clearCache(phone);
+        }
+
+        return !res;
+    }
+
+    /**
+     * 辅助方法: 随机生成验证码
+     * @param length
+     * @return
+     */
+    public String randCaptcha(int length) {
+        Random random = new Random();
+        String res = "";
+        for (int i = 0; i < length; i ++) {
+            int num = random.nextInt(10);
+            res += String.valueOf(num);
+        }
+        return res;
+    }
+
+    /**
+     * 定时任务 每半小时 清除一次不用的手机号
+     */
+    @Scheduled(fixedRate = 1000 * 60 * 30)
+    public void clearUnused() {
+        for (Phone phone: allPhones.values()) {
+            if (checkExpire(phone)) {
+                clearCache(phone);
+            }
+        }
+    }
+
+    private Phone fromCache(String phone) {
+        return allPhones.get(phone);
+    }
+    private void toCache(Phone phone) {
+        allPhones.put(phone.getNumber(), phone);
+    }
+    private void clearCache(Phone phone) { allPhones.remove(phone); }
+
+    private LocalDateTime expireTime() {
+        return LocalDateTime.now().plusSeconds(smsConfig.getCaptcha().getExpire());
+    }
+
+    // 过期返回 true
+    private boolean checkExpire(Phone phone) {
+        return LocalDateTime.now().isAfter(phone.getExpire());
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Phone {
+        String number;
+        String captcha;
+        LocalDateTime expire;
+    }
+
+}

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

@@ -0,0 +1,68 @@
+package com.yunzhi.niucai.common;
+
+import com.yunzhi.niucai.config.SMSConfig;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+@Slf4j
+@Component
+public class SMSUtils {
+    @Autowired
+    SMSConfig smsConfig;
+
+    public void sendMessage(Message message) throws Exception {
+        request(message);
+    }
+
+    private void request(Message message) throws Exception {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity entity = new HttpEntity(message, headers);
+
+        try {
+            RestTemplate request = new RestTemplate();
+            ResponseEntity<String> response = request.exchange(
+                    smsConfig.getApi(),
+                    HttpMethod.POST,
+                    entity,
+                    String.class,
+                    new Object()
+            );
+
+            if (null == response || null == response.getStatusCode()) {
+                throw new Exception("发送短信失败, 未知异常");
+            }
+
+            if (HttpStatus.OK.value() != response.getStatusCodeValue()) {
+                throw new Exception("发送短信失败, 网络异常");
+            }
+
+            String body = response.getBody();
+            if (!StringUtils.isEmpty(body)) {
+                if (!(body.indexOf("成功") > -1 || body.indexOf("success") > -1)) {
+                    throw new Exception("发送短信失败, " + body);
+                }
+            }
+
+        } catch (RestClientException e) {
+            log.error("发送短信消息失败 {}", e.getMessage());
+            throw e;
+        }
+
+        return;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Message {
+        String code;
+        String tel;
+        String[] params;
+    }
+}

src/main/java/com/yunzhi/niucai/config/SMSConfig.java

@@ -0,0 +1,24 @@
+package com.yunzhi.niucai.config;
+
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "sms")
+public class SMSConfig {
+    private String api;
+
+    @NestedConfigurationProperty
+    private Captcha captcha = new Captcha();
+
+    @Data
+    public static class Captcha {
+        private String code;
+        private String sign;
+        private Integer expire;
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.yunzhi.niucai.controller;
+
+import com.baomidou.mybatisplus.extension.api.R;
+import com.yunzhi.niucai.common.BaseController;
+import com.yunzhi.niucai.common.ResponseBean;
+import com.yunzhi.niucai.common.SMSCaptcha;
+import com.yunzhi.niucai.common.StringUtils;
+import com.yunzhi.niucai.vo.SportDicts;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@Api(tags = "通用接口")
+@RestController
+@RequestMapping("/")
+public class CommController extends BaseController {
+
+    @Autowired
+    SMSCaptcha smsCaptcha;
+
+    @GetMapping("/{client}/sms/captcha/{phone}")
+    @ApiOperation(value="发送短信验证码", notes = "默认有效时长 5 分钟", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean sendSMSCaptcha(@ApiParam(value = "客户端类型", allowableValues = "app,shop") @PathVariable String client,
+                                       @ApiParam(value = "手机号码") @PathVariable String phone) throws Exception {
+        if (StringUtils.isEmpty(phone)) {
+            return ResponseBean.error("手机号码不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (phone.length() != 11) {
+            return ResponseBean.error("手机号码只能为11位数字", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        smsCaptcha.send(phone, smsCaptcha.randCaptcha(6));
+
+        return ResponseBean.success("发送验证码到手机号"+phone+"成功");
+    }
+
+    @PostMapping("/{client}/sms/captcha/{phone}")
+    @ApiOperation(value="校验短信验证码", notes = "校验短信验证码", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean validateSMSCaptcha(@ApiParam(value = "客户端类型", allowableValues = "app,shop") @PathVariable String client,
+                                           @ApiParam(value = "手机号码") @PathVariable String phone,
+                                           @ApiParam(value = "验证码") @RequestParam String captcha) throws Exception {
+        if (!smsCaptcha.validate(phone, captcha)) {
+            return ResponseBean.error("验证码不正确或者已过期", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        return ResponseBean.success("success");
+    }
+}

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

@@ -5,6 +5,7 @@ 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 com.yunzhi.niucai.entity.TaCustomer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +21,9 @@ import com.yunzhi.niucai.service.ITaCustomerBettingService;
 import com.yunzhi.niucai.entity.TaCustomerBetting;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
     * 客户投注  前端控制器
@@ -39,25 +43,31 @@ public class TaCustomerBettingController extends BaseController {
     @Autowired
     public ITaCustomerBettingService iTaCustomerBettingService;
 
-//
-//    /**
-//     * 分页查询列表
-//     * @param pageNum
-//     * @param pageSize
-//     * @return
-//     */
-//    @RequestMapping(value="/taCustomerBetting",method= RequestMethod.GET)
-//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taCustomerBettingList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-//
-//		    IPage<TaCustomerBetting> pg = new Page<>(pageNum, pageSize);
-//            QueryWrapper<TaCustomerBetting> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.orderByDesc("create_date");
-//
-//            IPage<TaCustomerBetting> result = iTaCustomerBettingService.page(pg, queryWrapper);
-//            return ResponseBean.success(result);
-//    }
+
+    /**
+     * 查询投注列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/app/customer/betting/list",method= RequestMethod.GET)
+    @ApiOperation(value="查询投注列表", notes = "App 端只允许查询自己的", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taCustomerBettingList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                              @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              HttpServletRequest request) throws Exception{
+            TaCustomer taCustomer = getCustomer(request);
+            if (null == taCustomer) {
+                return ResponseBean.error("账户不存在, 或重新登录", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            }
+
+		    IPage<TaCustomerBetting> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerBetting> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("customer_id", taCustomer.getCustomerId());
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerBetting> result = iTaCustomerBettingService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
 //
 //    /**
 //     * 保存对象
@@ -107,13 +117,14 @@ public class TaCustomerBettingController extends BaseController {
 //        }
 //    }
 //
-//    /**
-//     * 根据id查询对象
-//     * @param id  实体ID
-//     */
-//    @RequestMapping(value="/taCustomerBetting/{id}",method= RequestMethod.GET)
-//    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-//    public ResponseBean taCustomerBettingGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-//        return ResponseBean.success(iTaCustomerBettingService.getById(id));
-//    }
+    /**
+     * 查询具体投注内容
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/app/customer/betting/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="依据ID查询投注详情", notes = "依据ID查询投注详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taCustomerBettingGet(@ApiParam("投注ID") @PathVariable Integer id) throws Exception{
+        Map<String, Object> result = iTaCustomerBettingService.getSummaryOf(id);
+        return ResponseBean.success(result);
+    }
 }

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

@@ -5,21 +5,20 @@ 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 com.yunzhi.niucai.common.SMSCaptcha;
+import com.yunzhi.niucai.common.StringUtils;
 import com.yunzhi.niucai.enums.StatusEnum;
+import com.yunzhi.niucai.vo.SignUpParam;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 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 org.springframework.web.bind.annotation.*;
 import com.yunzhi.niucai.service.ITaCustomerService;
 import com.yunzhi.niucai.entity.TaCustomer;
-import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -39,9 +38,40 @@ public class TaCustomerController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaCustomerController.class);
 
+    @Autowired
+    SMSCaptcha smsCaptcha;
+
     @Autowired
     public ITaCustomerService iTaCustomerService;
 
+    @PostMapping("/app/signup")
+    @ApiOperation(value="APP 用户注册", notes = "APP 用户注册", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean signUp(@ApiParam("注册参数") @RequestBody SignUpParam signUpParam) throws Exception {
+        if (null == signUpParam) {
+            return ResponseBean.error("请填写注册信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(signUpParam.getPhone())) {
+            return ResponseBean.error("请填写手机号码", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(signUpParam.getCaptcha())) {
+            return ResponseBean.error("请填写手机验证码", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(signUpParam.getPassword())) {
+            return ResponseBean.error("请填写登录密码", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (!smsCaptcha.validate(signUpParam.getPhone(), signUpParam.getCaptcha())) {
+            return ResponseBean.error("验证码无效或者已过期", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        iTaCustomerService.signUp(signUpParam);
+
+        return ResponseBean.success("success");
+    }
+
 //
 //    /**
 //     * 分页查询列表

src/main/java/com/yunzhi/niucai/controller/TaShopLotteryController.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.ITaShopLotteryService;
+import com.yunzhi.niucai.entity.TaShopLottery;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 店铺彩种设置 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-09-10
+ */
+
+@Api(tags = "店铺彩种设置")
+@RestController
+@RequestMapping("/")
+public class TaShopLotteryController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaShopLotteryController.class);
+
+    @Autowired
+    public ITaShopLotteryService iTaShopLotteryService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taShopLottery",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taShopLotteryList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+		    IPage<TaShopLottery> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaShopLottery> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaShopLottery> result = iTaShopLotteryService.page(pg, queryWrapper);
+            return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taShopLottery 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taShopLottery",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taShopLotteryAdd(@ApiParam("保存内容") @RequestBody TaShopLottery taShopLottery) throws Exception{
+
+        if (iTaShopLotteryService.save(taShopLottery)){
+            return ResponseBean.success(taShopLottery);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taShopLottery/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taShopLotteryDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iTaShopLotteryService.removeById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taShopLottery 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taShopLottery/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taShopLotteryUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody TaShopLottery taShopLottery) throws Exception{
+
+        if (iTaShopLotteryService.updateById(taShopLottery)){
+            return ResponseBean.success(iTaShopLotteryService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taShopLottery/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taShopLotteryGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTaShopLotteryService.getById(id));
+    }
+}

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

@@ -74,6 +74,11 @@ public class TaCustomer implements Serializable {
      */
     private Integer recPerson;
 
+    /**
+     * 推荐码
+     */
+    private String referralCode;
+
     /**
      * 粉丝数
      */

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

@@ -1,9 +1,12 @@
 package com.yunzhi.niucai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -96,5 +99,7 @@ public class TaCustomerBetting implements Serializable {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
-
+    @ApiModelProperty(value = "体彩相关明细")
+    @TableField(exist = false)
+    List<TaCustomerBettingSport> bettingSports;
 }

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

@@ -0,0 +1,52 @@
+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-09-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaShopLottery对象", description="店铺彩种设置")
+public class TaShopLottery implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "设置ID")
+    @TableId(value = "setting_id", type = IdType.AUTO)
+    private Integer settingId;
+
+    @ApiModelProperty(value = "彩种ID")
+    private String lotteryId;
+
+    @ApiModelProperty(value = "店铺ID")
+    private Integer shopId;
+
+    @ApiModelProperty(value = "是否打开")
+    private Boolean isOpen;
+
+    @ApiModelProperty(value = "最低出票额 单位分")
+    private Integer minCash;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+
+}

src/main/java/com/yunzhi/niucai/enums/ReferralCodeEnum.java

@@ -0,0 +1,16 @@
+package com.yunzhi.niucai.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ReferralCodeEnum {
+
+    CUSTOMER_START("C", "客户推荐码前缀"),
+    SHOP_START("S", "店铺推荐码前缀");
+
+    private String code;
+    private String desc;
+}

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

@@ -0,0 +1,18 @@
+package com.yunzhi.niucai.mapper;
+
+import com.yunzhi.niucai.entity.TaShopLottery;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 店铺彩种设置 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-10
+ */
+@Mapper
+public interface TaShopLotteryMapper extends BaseMapper<TaShopLottery> {
+
+}

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

@@ -15,4 +15,6 @@ import com.yunzhi.niucai.entity.TaCustomer;
 public interface ITaBettingPlanService extends IService<TaBettingPlan> {
 
     boolean betting(TaBettingPlan taBettingPlan, TaCustomer customer) throws Exception;
+
+    TaBettingPlan getDetailOfPlanById(Integer planId) throws Exception;
 }

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

@@ -4,6 +4,8 @@ import com.yunzhi.niucai.entity.TaBettingPlan;
 import com.yunzhi.niucai.entity.TaCustomerBetting;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  * 客户投注  服务类
@@ -15,4 +17,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ITaCustomerBettingService extends IService<TaCustomerBetting> {
 
     TaCustomerBetting saveByBetting(TaBettingPlan taBettingPlan) throws Exception;
+
+    Map<String, Object> getSummaryOf(Integer id) throws Exception;
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.niucai.service;
 
 import com.yunzhi.niucai.entity.TaCustomer;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.niucai.vo.SignUpParam;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaCustomerService extends IService<TaCustomer> {
 
+    boolean signUp(SignUpParam signUpParam) throws Exception;
 }

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

@@ -0,0 +1,17 @@
+package com.yunzhi.niucai.service;
+
+import com.yunzhi.niucai.entity.TaShopLottery;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 店铺彩种设置 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-10
+ */
+public interface ITaShopLotteryService extends IService<TaShopLottery> {
+
+    TaShopLottery getSettingBy(Integer shopId, String lotteryId) throws Exception;
+}

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

@@ -1,5 +1,6 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.niucai.common.BizUtils;
 import com.yunzhi.niucai.common.StringUtils;
 import com.yunzhi.niucai.entity.*;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -53,6 +55,9 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
     @Autowired
     ITaOrderService iTaOrderService;
 
+    @Autowired
+    ITaShopLotteryService iTaShopLotteryService;
+
     @Autowired
     TaBettingPlanItemMapper taBettingPlanItemMapper;
 
@@ -90,6 +95,45 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
         return true;
     }
 
+    @Override
+    public TaBettingPlan getDetailOfPlanById(Integer planId) throws Exception {
+        TaBettingPlan taBettingPlan = getById(planId);
+        if (null == taBettingPlan || StatusEnum.DELETED.getCode().equals(taBettingPlan.getStatus())) {
+            return null;
+        }
+
+        List<TaBettingPlanItem> itemList = getBettingPlanItemsByPlan(taBettingPlan);
+        taBettingPlan.setItemList(itemList);
+
+        if (null != itemList && taBettingPlan.getIsSport()) {
+            for (TaBettingPlanItem item: itemList) {
+                List<TaBettingPlanSportDetail> detailList = getBettingPlanSprotsByItem(item);
+                item.setDetailList(detailList);
+            }
+        }
+
+        return taBettingPlan;
+    }
+
+    private List<TaBettingPlanSportDetail> getBettingPlanSprotsByItem(TaBettingPlanItem item) throws Exception {
+        QueryWrapper<TaBettingPlanSportDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("item_no", item.getItemNo());
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("item_no");
+        queryWrapper.orderByAsc("serial_no");
+
+        return taBettingPlanSportDetailMapper.selectList(queryWrapper);
+    }
+
+    private List<TaBettingPlanItem> getBettingPlanItemsByPlan(TaBettingPlan taBettingPlan) throws Exception {
+        QueryWrapper<TaBettingPlanItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("plan_id", taBettingPlan.getPlanId());
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("item_no");
+
+        return taBettingPlanItemMapper.selectList(queryWrapper);
+    }
+
     private void validateShop(TaBettingPlan taBettingPlan) throws Exception {
         if (null == taBettingPlan.getShopId()) {
             throw new Exception("请选择投注店铺");
@@ -106,6 +150,25 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
         }
 
         taBettingPlan.setShopName(taShop.getName());
+
+        // 店铺彩种
+        TaShopLottery taShopLottery = iTaShopLotteryService.getSettingBy(taBettingPlan.getShopId(), taBettingPlan.getLotteryId());
+        if (null == taShopLottery) {
+            throw new Exception("当前店铺没有相关彩种设置");
+        }
+
+        if (null == taShopLottery.getIsOpen() && !taShopLottery.getIsOpen()) {
+            throw new Exception("店铺没有开售当前彩种");
+        }
+
+        // 出票额限制
+        if (null != taShopLottery.getMinCash()) {
+            if (taBettingPlan.getTotalPrice() < taShopLottery.getMinCash()) {
+                throw new Exception("出票额不能低于 " + String.format(".2f", taShopLottery.getMinCash() / 100) + "元");
+            }
+        }
+
+        return;
     }
 
     private void validateBetting(TaBettingPlan taBettingPlan) throws Exception {
@@ -124,9 +187,6 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
         // 校验彩种
         validateLottery(taBettingPlan, tdLottery);
 
-        //
-        validateShop(taBettingPlan);
-
         // 校验明细
         if (null == taBettingPlan.getItemList()) {
             throw new Exception("请设置投注内容");
@@ -209,6 +269,9 @@ public class TaBettingPlanServiceImpl extends ServiceImpl<TaBettingPlanMapper, T
             }
         }
 
+        // 校验店铺, 放到最后, 因为有金额校验
+        validateShop(taBettingPlan);
+
         return;
     }
 

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

@@ -1,15 +1,21 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.niucai.entity.*;
 import com.yunzhi.niucai.enums.StatusEnum;
 import com.yunzhi.niucai.mapper.TaCustomerBettingMapper;
 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 客户投注  服务实现类
@@ -21,9 +27,13 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingMapper, TaCustomerBetting> implements ITaCustomerBettingService {
 
+    @Autowired
+    ITaBettingPlanService iTaBettingPlanService;
+
     @Autowired
     TaCustomerBettingSportMapper taCustomerBettingSportMapper;
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public TaCustomerBetting saveByBetting(TaBettingPlan plan) throws Exception {
@@ -74,4 +84,34 @@ public class TaCustomerBettingServiceImpl extends ServiceImpl<TaCustomerBettingM
 
         return taCustomerBetting;
     }
+
+    @Override
+    public Map<String, Object> getSummaryOf(Integer id) throws Exception {
+        TaCustomerBetting betting = getById(id);
+        if (null == betting || StatusEnum.DELETED.getCode().equals(betting.getStatus())) {
+            throw new Exception("数据不存在, 投注ID不正确");
+        }
+
+        // 查询明细
+        List<TaCustomerBettingSport> bettingSports = getBettingSportByBetting(betting);
+        betting.setBettingSports(bettingSports);
+
+        // 查询方案
+        TaBettingPlan taBettingPlan = iTaBettingPlanService.getDetailOfPlanById(betting.getPlanId());
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("betting", betting);
+        result.put("plan", taBettingPlan);
+
+        return result;
+    }
+
+    private List<TaCustomerBettingSport> getBettingSportByBetting(TaCustomerBetting betting) throws Exception {
+        QueryWrapper<TaCustomerBettingSport> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("betting_id", betting.getBettingId());
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("serial_no");
+
+        return taCustomerBettingSportMapper.selectList(queryWrapper);
+    }
 }

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

@@ -1,10 +1,16 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.yunzhi.niucai.common.EncryptUtils;
+import com.yunzhi.niucai.common.StringUtils;
 import com.yunzhi.niucai.entity.TaCustomer;
+import com.yunzhi.niucai.enums.ReferralCodeEnum;
+import com.yunzhi.niucai.enums.StatusEnum;
 import com.yunzhi.niucai.mapper.TaCustomerMapper;
 import com.yunzhi.niucai.service.ITaCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.niucai.vo.SignUpParam;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -17,4 +23,39 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaCustomerServiceImpl extends ServiceImpl<TaCustomerMapper, TaCustomer> implements ITaCustomerService {
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean signUp(SignUpParam signUpParam) throws Exception {
+        TaCustomer taCustomer = new TaCustomer();
+        taCustomer.setName(signUpParam.getName());
+        taCustomer.setPhone(signUpParam.getPhone());
+        taCustomer.setReferralCode(signUpParam.getReferralCode());
+        taCustomer.setStatus(StatusEnum.NORMAL.getCode());
+
+        if (!save(taCustomer)) {
+            throw new Exception("生成个人信息失败");
+        }
+
+        // 获取最新信息, 因为有部分字段是自动生成的
+        taCustomer = getById(taCustomer.getCustomerId());
+
+        // 更新推荐人或者店铺
+        if (!StringUtils.isEmpty(signUpParam.getReferralCode())) {
+            // C 开头说明是客户
+            if (signUpParam.getReferralCode().startsWith(ReferralCodeEnum.CUSTOMER_START.getCode())) {
+
+            }
+
+            // S 开头说明是店铺
+        }
+
+        // 更新密码
+        taCustomer.setLoginPass(EncryptUtils.md5(signUpParam.getPassword(), taCustomer.getCustomerId().toString()));
+
+        if (!updateById(taCustomer)) {
+            throw new Exception("生成个人信息失败");
+        }
+
+        return true;
+    }
 }

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

@@ -0,0 +1,31 @@
+package com.yunzhi.niucai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.niucai.entity.TaShopLottery;
+import com.yunzhi.niucai.enums.StatusEnum;
+import com.yunzhi.niucai.mapper.TaShopLotteryMapper;
+import com.yunzhi.niucai.service.ITaShopLotteryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 店铺彩种设置 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-09-10
+ */
+@Service
+public class TaShopLotteryServiceImpl extends ServiceImpl<TaShopLotteryMapper, TaShopLottery> implements ITaShopLotteryService {
+
+    @Override
+    public TaShopLottery getSettingBy(Integer shopId, String lotteryId) throws Exception {
+        QueryWrapper<TaShopLottery> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("lottery_id", lotteryId);
+        queryWrapper.eq("shop_id", shopId);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+
+        return getOne(queryWrapper);
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.yunzhi.niucai.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "登录参数")
+@Data
+public class SignUpParam {
+    @ApiModelProperty("用户名")
+    String name;
+
+    @ApiModelProperty("密码, MD5 加密后数据")
+    String password;
+
+    @ApiModelProperty("手机")
+    String phone;
+
+    @ApiModelProperty("验证码")
+    String captcha;
+
+    @ApiModelProperty("推荐码")
+    String referralCode;
+}

src/main/resources/application-dev.yml

@@ -10,3 +10,12 @@ logging:
   level:
     root: info
     springfox: info
+
+###
+#sms:
+#  api: http://101.200.84.17:8081/sms
+#  captcha:
+#    code: "0301"
+#    sign: 牛彩
+#    # 有效时间 单位秒
+#    expire: 300

src/main/resources/application.yml

@@ -9,7 +9,7 @@ interceptor:
   permission:
     enable: true
     include-paths: /**
-    exclude-paths: /app/login, /app/logout,/swagger-ui/**,/swagger-resources/**,/v2/**
+    exclude-paths: /app/login, /app/logout, /app/signup, /swagger-ui/**,/swagger-resources/**,/v2/**
 
 ###
 mybatis-plus:
@@ -36,6 +36,15 @@ weixin:
     aesKey:
     msgDataFormat: JSON
 
+###
+sms:
+  api: http://micservice.ycjcjy.com/sms
+  captcha:
+    code: "0301"
+    sign: 牛彩
+    # 有效时间 单位秒
+    expire: 300
+
 ###
 spring:
   application:

src/main/resources/mapper/TaShopLotteryMapper.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.TaShopLotteryMapper">
+
+</mapper>