ycf0714

yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BargainController.java

@@ -2,18 +2,25 @@ package com.yami.shop.admin.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.yami.shop.bean.model.Bargain;
+import com.yami.shop.bean.model.BargainDetailParm;
+import com.yami.shop.bean.model.BargainParm;
 import com.yami.shop.bean.model.Product;
+import com.yami.shop.security.util.SecurityUtils;
 import com.yami.shop.service.BargainService;
 import com.yami.shop.service.ProductService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.Date;
+import java.util.List;
 
 @RestController
 @RequestMapping("/bargain")
+@Api(tags="砍价后台")
 public class BargainController {
 
     @Autowired
@@ -26,24 +33,58 @@ public class BargainController {
      * 保存
      */
     @PostMapping
+    @ApiOperation(value = "砍价活动设置参数", notes = "砍价活动设置参数")
     public ResponseEntity<String> save(@Valid @RequestBody Bargain bargain) {
+        String userId = SecurityUtils.getUser().getUserId();
         bargain.setCreatedAt(new Date());
+        bargain.setCreatedUser(userId);
         bargainService.saveBargain(bargain);
         return ResponseEntity.ok().build();
     }
 
+//    /**
+//     * 获取信息
+//     */
+//    @GetMapping("/info/{id}")
+//    @ApiOperation(value = "砍价活动查询", notes = "砍价活动查询")
+//    public ResponseEntity<Bargain> info (@PathVariable("id") Long id) {
+//        System.out.print("---------------------------------------------------------------------------------");
+//        Bargain bargain = bargainService.getBargainById(id);
+//        if(ObjectUtil.isNotNull(bargain)){
+//            Product product = productService.getProductByProdId(bargain.getProdId());
+//            bargain.setProduct(product);
+//        }
+//        return ResponseEntity.ok(bargain);
+//    }
+
+
     /**
-     * 获取信息
+     * 砍价统计
+     * @param prodName
+     * @return
      */
-    @GetMapping("/info/{id}")
-    public ResponseEntity<Bargain> info (@PathVariable("id") Long id) {
-        System.out.print("---------------------------------------------------------------------------------");
-        Bargain bargain = bargainService.getBargainById(id);
-        if(ObjectUtil.isNotNull(bargain)){
-            Product product = productService.getProductByProdId(bargain.getProdId());
-            bargain.setProduct(product);
+    @GetMapping("/infoTotal/{prodName}")
+    @ApiOperation(value = "砍价统计", notes = "砍价统计")
+    public ResponseEntity<List<BargainParm>> infoTotal (@PathVariable("prodName") String prodName) {
+        if(prodName.equals("\"\"")){
+            prodName="";
+        }
+        String userId = SecurityUtils.getUser().getUserId();
+        List<BargainParm> bargainParmList = bargainService.selectBargainTotalList(prodName,userId);
+        return ResponseEntity.ok(bargainParmList);
     }
-        return ResponseEntity.ok(bargain);
+
+    /**
+     * 砍价统计
+     * @param id
+     * @return
+     */
+    @GetMapping("/infoDetail/{id}")
+    @ApiOperation(value = "砍价详情", notes = "砍价详情")
+    public ResponseEntity<BargainDetailParm> infoDetail (@PathVariable("id") Long id) {
+        BargainDetailParm bargainDetail = bargainService.selectBargainDetail(id);
+        bargainDetail.setResidueMoney(bargainDetail.getPrice()-bargainDetail.getCutMoney());
+        return ResponseEntity.ok(bargainDetail);
     }
 
 }

yami-shop-api/src/main/java/com/yami/shop/api/controller/BargainController.java

@@ -5,15 +5,12 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yami.shop.bean.model.Bargain;
-import com.yami.shop.bean.model.BargainHelp;
-import com.yami.shop.bean.model.BargainSend;
-import com.yami.shop.bean.model.Product;
+import com.google.common.collect.Maps;
+import com.yami.shop.bean.enums.SmsType;
+import com.yami.shop.bean.model.*;
 import com.yami.shop.common.util.PageParam;
-import com.yami.shop.service.BargainHelpService;
-import com.yami.shop.service.BargainSendService;
-import com.yami.shop.service.BargainService;
-import com.yami.shop.service.ProductService;
+import com.yami.shop.security.util.SecurityUtils;
+import com.yami.shop.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,10 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.beans.Transient;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
-import java.util.Scanner;
+import java.util.*;
 
 @RestController
 @RequestMapping("/bargain")
@@ -44,6 +38,11 @@ public class BargainController {
     @Autowired
     private ProductService productService;
 
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private SmsLogService smsLogService;
     /**
      * 分页获取商品信息
      */
@@ -94,25 +93,82 @@ public class BargainController {
         BS.setProduct(product);
         Bargain bargain = bargainService.getBargainById(bargainSend.getActivityId());
         BS.setBargain(bargain);
-        List<BargainHelp> bargainHelpList = bargainHelpService.selectListByBargaiOrderId(bargainSend.getId());
+        List<BargainHelp> bargainHelpList = bargainHelpService.selectListByBargainOrderId(bargainSend.getId());
         BS.setBargainHelpList(bargainHelpList);
         return ResponseEntity.ok(BS);
     }
 
 
     /**
-     * 获取发起人砍价任务详情
+     * 帮好友砍价
      */
-    @GetMapping("/infoBargainSendDetail/{id}")
-    @ApiOperation(value = "发起人砍价任务详情", notes = "获取发起人砍价任务详情")
-    public ResponseEntity<BargainSend> infoBargainSendDetail (@PathVariable("id") Long id) {
-        BargainSend bargainSend = bargainSendService.getBargainSendById(id);
-        Product product = productService.getProductByProdId(bargainSend.getProdId());
-        bargainSend.setProduct(product);
-
-
-
-        return ResponseEntity.ok(bargainSend);
+    @Transactional
+    @PostMapping("/helpBargain")
+    @ApiOperation(value = "帮好友砍价", notes = "帮好友砍价")
+    public ResponseEntity<String> helpBargain (@Valid @RequestBody BargainHelpParm bargainHelpParm) {
+        SmsLog smsLog = smsLogService.selectSmsByMobileAndType(bargainHelpParm.getUserMobile(),1);
+        if(bargainHelpParm.getCode().equals(smsLog.getMobileCode())){
+            User user = userService.getUserByUserMobile(bargainHelpParm.getUserMobile());//帮助者电话
+
+            if(ObjectUtil.isNotNull(user)){
+                BargainHelp bargainHelp = bargainHelpService.selectBargainHelp(bargainHelpParm.getBargainOrderId(),user.getUserId());
+                if(ObjectUtil.isNotNull(bargainHelp)){
+                    return ResponseEntity.ok("您已帮该用户砍过价了");
+                }
+            }
+            Bargain bargain = bargainService.getBargainById(bargainHelpParm.getActivityId());//取能砍的最低价格
+//            String userId = SecurityUtils.getUser().getUserId();
+            Product product = productService.getProductByProdId(bargainHelpParm.getProdId());//查询商品原价
+            //查询发起人对应的砍价者砍价合计
+            List<BargainHelp> bargainHelpList=bargainHelpService.selectListByBargainOrderId(bargainHelpParm.getBargainOrderId());
+            double cutMoneys =0;
+            for(BargainHelp bargainHelp:bargainHelpList){
+                cutMoneys += bargainHelp.getBargainMoney();
+            }
+            double canCut = product.getPrice()-cutMoneys;//能砍的价格
+            double randNumber = 0;
+            //对比
+            Random rand = new Random();
+            double MAX =0;
+            double MIN =0;
+            BargainHelp bargainHelp =new BargainHelp();
+            bargainHelp.setBargainOrderId(bargainHelpParm.getBargainOrderId());
+            bargainHelp.setCreatedAt(new Date());
+            if(ObjectUtil.isNotNull(user)){
+                //老用户
+                MAX = bargain.getOldMax();
+                MIN = bargain.getOldMin();
+            }else{
+                //新增用户
+                user = new User();
+                String userId= UUID.randomUUID().toString().replace("-", "");
+                user.setUserId(userId);
+                user.setNickName(bargainHelpParm.getNickName());
+                user.setPic(bargainHelpParm.getHeadImg());
+                user.setStatus(1);
+                user.setUserMobile(bargainHelpParm.getUserMobile());
+                user.setModifyTime(new Date());
+                user.setUserRegtime(new Date());
+                userService.save(user);
+                //帮忙砍价
+                MAX = bargain.getNewMax();
+                MIN = bargain.getNewMin();
+            }
+            if(canCut<MAX){
+                randNumber = canCut;
+            }else{
+                randNumber = rand.nextDouble() * (MAX - MIN) + MIN;
+            }
+            bargainHelp.setAssistorId(user.getUserId());
+            bargainHelp.setNickName(user.getNickName());
+            bargainHelp.setHeadImg(user.getPic());
+            bargainHelp.setBargainMoney(randNumber);
+            bargainHelp.setIsUser(1);
+            bargainHelpService.saveBargainHelp(bargainHelp);
+            bargainSendService.updateCount(bargainHelpParm.getBargainOrderId());
+            return ResponseEntity.ok(randNumber+"");
+        }
+        return ResponseEntity.ok("验证码错误");
     }
 
 

yami-shop-api/src/main/java/com/yami/shop/api/controller/SmsController.java

@@ -40,7 +40,6 @@ public class SmsController {
     @ApiOperation(value="发送验证码", notes="用户的发送验证码")
     public ResponseEntity<Void> audit(@RequestBody SendSmsParam sendSmsParam) {
 		String userId = SecurityUtils.getUser().getUserId();
-		smsLogService.sendSms(SmsType.VALID, userId, sendSmsParam.getMobile(),Maps.newHashMap());
 		
 		return ResponseEntity.ok().build();
     }

yami-shop-api/src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ spring:
 #    username: root
 #    password: root
 #    driver-class-name: com.mysql.cj.jdbc.Driver
-#    type: com.zaxxer.hikari.HikariDataSource
+    type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 0
       maximum-pool-size: 20

yami-shop-api/src/main/resources/application.yml

@@ -54,8 +54,10 @@ management:
 wx:
   miniapp:
     configs:
-      - appid: wx42732c972778dc69 #微信小程序的appid
-        secret: 797f5ac0dd3e5b7f6afa68d66718a7b6 #微信小程序的Secret
+      - appid: wx72780b89fe2ee6f4
+        secret: 78837e61297df3135e60c3701ab0b005
+#      - appid: wx42732c972778dc69 #微信小程序的appid
+#        secret: 797f5ac0dd3e5b7f6afa68d66718a7b6 #微信小程序的Secret
         token: #微信小程序消息服务器配置的token
         aesKey: #微信小程序消息服务器配置的EncodingAESKey
         msgDataFormat: JSON
\ No newline at end of file

yami-shop-bean/src/main/java/com/yami/shop/bean/model/Bargain.java

@@ -23,7 +23,7 @@ public class Bargain implements Serializable {
      * 砍价活动id
      */
     @TableId
-    @ApiModelProperty(value = "主键自增", required = true)
+    @ApiModelProperty(value = "主键自增", required = false)
     private Long id;
 
     /**
@@ -101,16 +101,23 @@ public class Bargain implements Serializable {
     private Integer stocks;
 
     /**
+     * 创建用户
+     */
+    @ApiModelProperty(value = "创建时间", required = false)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String createdUser;
+
+    /**
      * 创建时间
      */
-    @ApiModelProperty(value = "创建时间", required = true)
+    @ApiModelProperty(value = "创建时间", required = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdAt;
 
     /**
      * 商品信息
      */
-    @ApiModelProperty(value = "商品信息", required = true)
+    @ApiModelProperty(value = "商品信息", required = false)
     @TableField(exist = false)
     private Product product;
 
@@ -118,13 +125,13 @@ public class Bargain implements Serializable {
      * 砍价发起人
      */
     @TableField(exist = false)
-    @ApiModelProperty(value = "砍价发起人列表", required = true)
+    @ApiModelProperty(value = "砍价发起人列表", required = false)
     private List<BargainSend> bargainSendList;
 
     /**
      * 砍价完成人数
      */
-    @ApiModelProperty(value = "砍价完成人数", required = true)
+    @ApiModelProperty(value = "砍价完成人数", required = false)
     @TableField(exist = false)
     private Integer count;
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/model/BargainDetailParm.java

+package com.yami.shop.bean.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BargainDetailParm {
+    /**
+     * 砍价活动id
+     */
+    @ApiModelProperty(value = "砍价活动id", required = true)
+    private Long id;
+
+    /**
+     * 序号
+     */
+    @ApiModelProperty(value = "用户名称", required = false)
+    private String nickName;
+
+    /**
+     * 手机号码
+     */
+    @ApiModelProperty(value = "手机号码", required = false)
+    private String userMobile;
+
+    /**
+     * 砍掉价格
+     */
+    @ApiModelProperty(value = "砍掉价格", required = false)
+    private double cutMoney;
+
+    /**
+     * 现价
+     */
+    @ApiModelProperty(value = "现价", required = false)
+    private double price;
+
+    /**
+     * 剩余金额
+     */
+    @ApiModelProperty(value = "剩余金额", required = false)
+    private double residueMoney;
+
+    /**
+     * 砍价次数
+     */
+    @ApiModelProperty(value = "砍价次数", required = false)
+    private Integer cutNum;
+    /**
+     * 新用户参与
+     */
+    @ApiModelProperty(value = "新用户参与", required = false)
+    private Integer newNum;
+    /**
+     * 老用户参与
+     */
+    @ApiModelProperty(value = "老用户参与", required = false)
+    private Integer oldNum;
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/model/BargainHelp.java

@@ -18,15 +18,16 @@ public class BargainHelp {
      * 帮忙砍价表的主键id
      */
     @TableId
-    @ApiModelProperty(value = "主键id自增", required = true)
+    @ApiModelProperty(value = "主键id自增", required = false)
     private Long id;
 
     /**
      * 砍价表id
      */
-    @ApiModelProperty(value = "砍价表id", required = true)
+    @ApiModelProperty(value = "发起砍价表id", required = true)
     private Long bargainOrderId;
 
+
     /**
      * 帮助者ID
      */
@@ -52,15 +53,21 @@ public class BargainHelp {
     private Double bargainMoney;
 
     /**
+     * 0：新用户，1老用户
+     */
+    @ApiModelProperty(value = "砍掉的价格", required = false)
+    private Integer isUser;
+
+    /**
      * ip
      */
-    @ApiModelProperty(value = "ip", required = true)
+    @ApiModelProperty(value = "ip", required = false)
     private String ip;
 
     /**
      * 创建时间
      */
-    @ApiModelProperty(value = "创建时间", required = true)
+    @ApiModelProperty(value = "创建时间", required = false)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createdAt;
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/model/BargainHelpParm.java

+package com.yami.shop.bean.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BargainHelpParm {
+
+
+    @ApiModelProperty(value = "帮助者电话", required = true)
+    private String userMobile;
+    @ApiModelProperty(value = "验证码", required = true)
+    private String code;
+    @ApiModelProperty(value = "商品ID", required = true)
+    private Long prodId;
+    @ApiModelProperty(value = "发起砍价表id", required = true)
+    private Long bargainOrderId;
+    @ApiModelProperty(value = "砍价活动id", required = true)
+    private Long activityId;
+    @ApiModelProperty(value = "帮助者昵称", required = true)
+    private String nickName;
+    @ApiModelProperty(value = "帮助者头像", required = true)
+    private String headImg;
+
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/model/BargainParm.java

+package com.yami.shop.bean.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class BargainParm {
+    /**
+     * 砍价活动id
+     */
+    @ApiModelProperty(value = "砍价活动id", required = false)
+    private Long id;
+
+    /**
+     * 序号
+     */
+    @ApiModelProperty(value = "序号", required = false)
+    private Long sort;
+
+    /**
+     * 活动名称
+     */
+    @ApiModelProperty(value = "活动名称", required = false)
+    private String prodName;
+
+    /**
+     * 参与用户
+     */
+    @ApiModelProperty(value = "参与用户", required = false)
+    private Integer userNum;
+
+    /**
+     * 成交次数
+     */
+    @ApiModelProperty(value = "成交次数", required = false)
+    private Integer successNum;
+
+    /**
+     * 累计成交金额
+     */
+    @ApiModelProperty(value = "累计成交金额", required = false)
+    private Integer endPriceNum;
+
+    /**
+     * 累计砍价次数
+     */
+    @ApiModelProperty(value = "累计砍价次数", required = false)
+    private Integer bargainNum;
+
+
+}

yami-shop-bean/src/main/java/com/yami/shop/bean/model/BargainSend.java

@@ -20,7 +20,7 @@ public class BargainSend {
      * 发起砍价id
      */
     @TableId
-    @ApiModelProperty(value = "主键id自增", required = true)
+    @ApiModelProperty(value = "主键id自增", required = false)
     private Long id;
 
     /**
@@ -44,7 +44,7 @@ public class BargainSend {
     /**
      * 被砍价次数
      */
-    @ApiModelProperty(value = "被砍价次数", required = true)
+    @ApiModelProperty(value = "被砍价次数", required = false)
     private Integer bargainCount;
 
     /**

yami-shop-service/src/main/java/com/yami/shop/dao/BargainHelpMapper.java

@@ -8,6 +8,6 @@ import java.util.List;
 
 public interface BargainHelpMapper extends BaseMapper<BargainHelp> {
 
-    List<BargainHelp> selectListByBargaiOrderId(@Param("bargaiOrderId") Long bargaiOrderId);
-
+    List<BargainHelp> selectListByBargainOrderId(@Param("bargainOrderId") Long bargainOrderId);
+    BargainHelp selectBargainHelp(@Param("bargainOrderId") Long bargainOrderId,@Param("assistorId")String assistorId);
 }

yami-shop-service/src/main/java/com/yami/shop/dao/BargainMapper.java

@@ -2,7 +2,16 @@ package com.yami.shop.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yami.shop.bean.model.Bargain;
+import com.yami.shop.bean.model.BargainDetailParm;
+import com.yami.shop.bean.model.BargainParm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface BargainMapper extends BaseMapper<Bargain> {
 
+    List<BargainParm> selectBargainTotalList(@Param("prodName")String prodName,@Param("createdUser")String createdUser);
+
+    BargainDetailParm selectBargainDetail(@Param("id")Long id);
+
 }

yami-shop-service/src/main/java/com/yami/shop/dao/BargainSendMapper.java

@@ -13,4 +13,6 @@ public interface BargainSendMapper extends BaseMapper<BargainSend> {
     Integer selectFinishOrderTask(@Param("activityId") Long activityId);
 
     BargainSend selectBargainTask(@Param("userId") String userId,@Param("activityId") Long activityId);
+
+    int updateCount(@Param("id") Long id);
 }

yami-shop-service/src/main/java/com/yami/shop/dao/SmsLogMapper.java

@@ -18,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface SmsLogMapper extends BaseMapper<SmsLog> {
 
 	void invalidSmsByMobileAndType(@Param("mobile") String mobile, @Param("type") Integer type);
+
+	SmsLog selectSmsByMobileAndType(@Param("mobile") String mobile, @Param("status") Integer status);
 }
\ No newline at end of file

yami-shop-service/src/main/java/com/yami/shop/dao/UserMapper.java

@@ -20,4 +20,6 @@ import org.springframework.stereotype.Repository;
 public interface UserMapper extends BaseMapper<User> {
 
 	User getUserByBizUserId(@Param("appId")Integer appId, @Param("bizUserId")String bizUserId);
+
+	User getUserByUserMobile(@Param("userMobile")String userMobile);
 }

yami-shop-service/src/main/java/com/yami/shop/service/BargainHelpService.java

@@ -8,5 +8,9 @@ import java.util.List;
 
 public interface BargainHelpService extends IService<BargainHelp> {
 
-    List<BargainHelp> selectListByBargaiOrderId(Long bargaiOrderId);
+    List<BargainHelp> selectListByBargainOrderId(Long bargainOrderId);
+
+    void saveBargainHelp(BargainHelp bargainHelp);
+
+    BargainHelp selectBargainHelp(Long bargainOrderId,String assistorId);
 }

yami-shop-service/src/main/java/com/yami/shop/service/BargainSendService.java

@@ -42,4 +42,6 @@ public interface BargainSendService extends IService<BargainSend> {
      * @return
      */
     BargainSend selectBargainTask(String userId, long activityId);
+
+    void updateCount(long id);
 }

yami-shop-service/src/main/java/com/yami/shop/service/BargainService.java

@@ -2,6 +2,11 @@ package com.yami.shop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yami.shop.bean.model.Bargain;
+import com.yami.shop.bean.model.BargainDetailParm;
+import com.yami.shop.bean.model.BargainParm;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface BargainService extends IService<Bargain> {
     /**
@@ -18,4 +23,18 @@ public interface BargainService extends IService<Bargain> {
      * @return
      */
     Bargain getBargainById(Long id);
+
+    /**
+     * 砍价统计
+     * @param prodName
+     * @return
+     */
+    List<BargainParm> selectBargainTotalList(String prodName,String createdUser);
+
+    /**
+     * 砍价详情
+     * @param id
+     * @return
+     */
+    BargainDetailParm selectBargainDetail(Long id);
 }

yami-shop-service/src/main/java/com/yami/shop/service/SmsLogService.java

@@ -25,4 +25,6 @@ public interface SmsLogService extends IService<SmsLog> {
 	public void sendSms(SmsType smsType,String userId,String mobile,Map<String,String> params);
 	
 	public boolean checkValidCode(String mobile, String code,SmsType smsType);
+
+	SmsLog selectSmsByMobileAndType(String mobile,Integer status);
 }

yami-shop-service/src/main/java/com/yami/shop/service/UserService.java

@@ -32,4 +32,5 @@ public interface UserService extends IService<User> {
      */
     String registerPhone(WxParamsVo wxParamsVo, WxMaService wxService, String userId);
 
+    User getUserByUserMobile(String userMobile);
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/BargainHelpServiceImpl.java

@@ -15,7 +15,17 @@ public class BargainHelpServiceImpl extends ServiceImpl<BargainHelpMapper, Barga
     private BargainHelpMapper bargainHelpMapper;
 
     @Override
-    public List<BargainHelp> selectListByBargaiOrderId(Long bargaiOrderId) {
-        return bargainHelpMapper.selectListByBargaiOrderId(bargaiOrderId);
+    public List<BargainHelp> selectListByBargainOrderId(Long bargainOrderId) {
+        return bargainHelpMapper.selectListByBargainOrderId(bargainOrderId);
+    }
+
+    @Override
+    public void saveBargainHelp(BargainHelp bargainHelp) {
+        bargainHelpMapper.insert(bargainHelp);
+    }
+
+    @Override
+    public BargainHelp selectBargainHelp(Long bargainOrderId, String assistorId) {
+        return bargainHelpMapper.selectBargainHelp(bargainOrderId,assistorId);
     }
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/BargainSendServiceImpl.java

@@ -42,4 +42,9 @@ public class BargainSendServiceImpl extends ServiceImpl<BargainSendMapper, Barga
     public BargainSend selectBargainTask(String userId, long activityId) {
         return bargainSendMapper.selectBargainTask(userId,activityId);
     }
+
+    @Override
+    public void updateCount( long id) {
+        bargainSendMapper.updateCount(id);
+    }
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/BargainServiceImpl.java

@@ -2,11 +2,15 @@ package com.yami.shop.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yami.shop.bean.model.Bargain;
+import com.yami.shop.bean.model.BargainDetailParm;
+import com.yami.shop.bean.model.BargainParm;
 import com.yami.shop.dao.BargainMapper;
 import com.yami.shop.service.BargainService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class BargainServiceImpl extends ServiceImpl<BargainMapper, Bargain> implements BargainService{
     @Autowired
@@ -21,4 +25,14 @@ public class BargainServiceImpl extends ServiceImpl<BargainMapper, Bargain> impl
     public Bargain getBargainById(Long id) {
         return bargainMapper.selectById(id);
     }
+
+    @Override
+    public List<BargainParm> selectBargainTotalList(String prodName,String createdUser) {
+        return bargainMapper.selectBargainTotalList(prodName,createdUser);
+    }
+
+    @Override
+    public BargainDetailParm selectBargainDetail(Long id) {
+        return bargainMapper.selectBargainDetail(id);
+    }
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/SmsLogServiceImpl.java

@@ -166,6 +166,11 @@ public class SmsLogServiceImpl extends ServiceImpl<SmsLogMapper, SmsLog> impleme
         return true;
     }
 
+    @Override
+    public SmsLog selectSmsByMobileAndType(String mobile, Integer status) {
+        return smsLogMapper.selectSmsByMobileAndType(mobile,status);
+    }
+
     private void sendSms(String mobile, String templateCode, Map<String, String> params) throws ClientException {
 
         //可自助调整超时时间

yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java

@@ -62,4 +62,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
         return null;
     }
+
+    @Override
+    public User getUserByUserMobile(String userMobile) {
+        return userMapper.getUserByUserMobile(userMobile);
+    }
 }

yami-shop-service/src/main/resources/mapper/BargainHelpMapper.xml

@@ -11,11 +11,15 @@
 	<result column="nick_name" jdbcType="VARCHAR" property="nickName" />
     <result column="head_img" jdbcType="VARCHAR" property="headImg" />
 	<result column="bargain_money" jdbcType="DECIMAL" property="bargainMoney" />
+      <result column="is_user" jdbcType="INTEGER" property="isUser" />
     <result column="ip" jdbcType="VARCHAR" property="ip" />
 	<result column="created_at" jdbcType="TIMESTAMP" property="createdAT" />
 
   </resultMap>
-    <select id="selectListByBargaiOrderId" resultType="com.yami.shop.bean.model.BargainHelp">
-        select * from tz_bargain_help WHERE bargain_order_id=#{bargaiOrderId}
+    <select id="selectListByBargainOrderId" resultType="com.yami.shop.bean.model.BargainHelp">
+        select * from tz_bargain_help WHERE bargain_order_id=#{bargainOrderId}
+    </select>
+    <select id="selectBargainHelp" resultType="com.yami.shop.bean.model.BargainHelp">
+        select * from tz_bargain_help WHERE bargain_order_id=#{bargainOrderId} and assistor_id = #{assistorId}
     </select>
 </mapper>

yami-shop-service/src/main/resources/mapper/BargainMapper.xml

@@ -18,8 +18,53 @@
       <result column="old_min" jdbcType="DECIMAL" property="oldMin" />
       <result column="min_price" jdbcType="DECIMAL" property="minPrice" />
       <result column="stocks" jdbcType="INTEGER" property="stocks" />
+      <result column="created_user" jdbcType="VARCHAR" property="createdUser" />
       <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
 
   </resultMap>
 
+  <select id="selectBargainTotalList" resultType="com.yami.shop.bean.model.BargainParm">
+        select
+            b.id,
+            b.sort,
+            b.prod_name,
+            count(*) userNum,
+            SUM(CASE WHEN bs.is_addorder=1 then bs.is_addorder else 0 end) successNum,
+            SUM(CASE WHEN bs.is_addorder=1 then bs.end_price else 0 end) endPriceNum,
+            sum(CASE WHEN bh.id !="" then 1 else 0 end) bargainNum
+        from tz_bargain b
+        left join tz_bargain_send bs
+        on b.id =bs.activity_id
+        left join tz_bargain_help bh
+        on bs.id= bh.bargain_order_id
+        where 1=1
+          <if test="createdUser != null and createdUser != ''">
+            AND created_user = #{createdUser}
+          </if>
+        <if test="prodName != null and prodName != ''">
+          AND b.prod_name like'%#{prodName}%'
+        </if>
+
+    </select>
+    <select id="selectBargainDetail" resultType="com.yami.shop.bean.model.BargainDetailParm">
+        select
+            b.id id,
+            u.nick_name nickName,
+            u.user_mobile userMobile,
+            SUM(CASE WHEN bs.id != "" then bh.bargain_money else 0 end) cutMoney,
+            SUM(CASE WHEN b.prod_id != "" then p.price else 0 end) price,
+            count(bh.id!=0 or null) cutNum,
+            count(bh.is_user=0 OR NULL) newNum,
+            count(bh.is_user=1 OR NULL) oldNum
+        from tz_bargain b
+        left join tz_bargain_send bs
+        on b.id =bs.activity_id
+        left join tz_user u
+        on bs.user_id=u.user_id
+        left join tz_bargain_help bh
+        on bs.id= bh.bargain_order_id
+        left join tz_prod p
+        on b.prod_id=p.prod_id
+        where b.id=#{id}
+    </select>
 </mapper>

yami-shop-service/src/main/resources/mapper/BargainSendMapper.xml

@@ -28,4 +28,10 @@
         select * from tz_bargain_send WHERE user_id = #{userId} and activity_id=#{activityId}
     </select>
 
+    <update id="updateCount" parameterType="com.yami.shop.bean.model.BargainSend">
+		update tz_bargain_send
+		set bargain_count = bargain_count+1
+		where id = #{id}
+	</update>
 </mapper>
+

yami-shop-service/src/main/resources/mapper/ProductMapper.xml

@@ -233,4 +233,5 @@
         WHERE uc.user_id = #{userId})
     </select>
 
+
 </mapper>

yami-shop-service/src/main/resources/mapper/SmsLogMapper.xml

@@ -19,4 +19,7 @@
   <update id="invalidSmsByMobileAndType">
   	update tz_sms_log set status = 0 where user_phone = #{mobile} and type = #{type}
   </update>
+  <select id="selectSmsByMobileAndType" resultMap="BaseResultMap">
+    select * from tz_sms_log where user_phone=#{mobile} and status= #{status} order by rec_date desc limit 1
+  </select>
 </mapper>
\ No newline at end of file

yami-shop-service/src/main/resources/mapper/UserMapper.xml

@@ -29,6 +29,10 @@
     select * from tz_user u where u.user_id =  (select user_id from tz_app_connect ac where ac.app_id = #{appId} and ac.biz_user_id = #{bizUserId})
   </select>
 
+  <select id="getUserByUserMobile" resultMap="BaseResultMap">
+    select * from tz_user u where user_mobile=#{userMobile}
+   </select>
+