Accept Merge Request #27: (dev-lzl -> dev-minio)

Merge Request: 合并

Created By: @刘子麟
Accepted By: @刘子麟
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/27?initial=true

db/insert_241014.sql

@@ -0,0 +1,6 @@
+-- 创建站点表
+CREATE TABLE rider_station
+(
+    id           INT PRIMARY KEY,
+    station_name VARCHAR(100)
+);

db/insert_241021.sql

@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS `tb_coupon_log`;
+CREATE TABLE `tb_coupon_log`
+(
+    `id`                 int(11) NOT NULL AUTO_INCREMENT,
+    `coupon_id`          int(11) NULL DEFAULT NULL COMMENT '优惠券id',
+    `content`            varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '内容',
+    `create_time`        datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
+    `create_sys_user_id` int(11) NULL DEFAULT NULL COMMENT '创建人',
+    `coupon_name`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '优惠券名称',
+    `coupon_picture`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '优惠券图片',
+    `end_date`           varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '有效期天数',
+    `min_money`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '优惠券可使用订单最低金额',
+    `goods_type`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '优惠券可使用商品类型',
+    `need_integral`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '购买此优惠券需要积分数',
+    `money`              decimal(10, 2) NULL DEFAULT NULL COMMENT '优惠券金额',
+    `shop_id`            int(11) NULL DEFAULT NULL COMMENT '所属商铺 0为总后台发布的优惠券',
+    `state`              int(11) NULL DEFAULT NULL COMMENT '状态:0-待审核，1-发布，2-撤销',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;

db/insert_241023.sql

@@ -0,0 +1,12 @@
+DROP TABLE IF EXISTS `rider_bank_card_info`;
+CREATE TABLE `rider_bank_card_info`
+(
+    `id`        bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `user_id`   bigint(20) NOT NULL COMMENT '用户id',
+    `card_no`   varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '卡号',
+    `open_bank` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '开户行',
+    `real_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '户主名称',
+    `bank_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '银行名称',
+    `del_flag`  varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL DEFAULT '0' COMMENT '删除标识;1 是 0否',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;

src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java

@@ -125,7 +125,7 @@ public class UserMoneyDetails implements Serializable {
      * 订单号
      */
     @TableField(exist = false)
-    private BigDecimal orderNumber;
+    private String orderNumber;
 
     /**
      * 订单号

src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java

@@ -171,7 +171,7 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
             TbIndent tbIndent = tbIndentService.getOne(wrapperTBI);
             if (ObjectUtils.isNotEmpty(tbIndent)) {
                 wrapper.eq(TbIndentSmsSendLog::getSuccessFlag,"1");
-                wrapper.eq(TbIndentSmsSendLog::getOrderId,tbIndent.getOrderId());
+                wrapper.eq(TbIndentSmsSendLog::getOrderId,tbIndent.getIndentId());
                 List<TbIndentSmsSendLog> list = smsSendLogService.list(wrapper);
                 Double smsMoneyTotal=smsMoney*list.size();
                 BigDecimal decimal = new BigDecimal(smsMoneyTotal).setScale(2, BigDecimal.ROUND_DOWN);
@@ -197,8 +197,7 @@ public class UserMoneyDetailsServiceImpl extends ServiceImpl<UserMoneyDetailsDao
 //        总数
         iPage.setTotal(total);
         PageUtils pageUtils = new PageUtils(iPage);
-        List<?> list = pageUtils.getList();
-        System.out.println("list = " + list);
+
         return pageUtils;
     }
 

src/main/java/com/sqx/modules/coupon/controller/CouponController.java

@@ -53,10 +53,10 @@ public class CouponController extends AbstractController {
     }
 
     @ApiOperation("删除发布的优惠券")
-    @PostMapping(value = "deleteCoupon")
-    public Result deleteCoupon(Long couponId){
+        @PostMapping(value = "deleteCoupon")
+    public Result deleteCoupon(Long couponId,Integer sysUserId){
 
-        return tbCouponService.deleteCoupon(couponId);
+        return tbCouponService.deleteCoupon(couponId,sysUserId);
     }
 
     @ApiOperation("修改优惠券信息")
@@ -79,4 +79,11 @@ public class CouponController extends AbstractController {
         return tbCouponService.checkCoupon(couponId, sysUserId, state);
     }
 
+
+    @ApiOperation("查看发布的优惠券")
+    @GetMapping(value = "selectAdminCoupon")
+        public Result selectAdminCoupon(Integer page, Integer limit,Integer state){
+        return tbCouponService.selectAdminCoupon(page, limit,state);
+    }
+
 }

src/main/java/com/sqx/modules/coupon/controller/CouponLogController.java

@@ -0,0 +1,26 @@
+package com.sqx.modules.coupon.controller;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.coupon.service.TbCouponLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(value = "管理端-优惠券记录", tags = {"管理端-优惠券记录"})
+@RequestMapping(value = "/admin/couponLog")
+public class CouponLogController {
+
+    @Autowired
+    private TbCouponLogService tbCouponLogService;
+
+
+    @ApiOperation("查看优惠券日志记录")
+    @GetMapping(value = "selectCouponLog")
+    public Result selectCouponLog(Integer page, Integer limit){
+        return tbCouponLogService.selectCouponLog(page, limit);
+    }
+}

src/main/java/com/sqx/modules/coupon/dao/TbCouponLogDao.java

@@ -0,0 +1,13 @@
+package com.sqx.modules.coupon.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sqx.modules.coupon.entity.TbCoupon;
+import com.sqx.modules.coupon.entity.TbCouponLog;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TbCouponLogDao extends BaseMapper<TbCouponLog> {
+    IPage<TbCouponLog> selectCouponLogPage(Page<TbCouponLog> pages);
+}

src/main/java/com/sqx/modules/coupon/entity/TbCouponLog.java

@@ -0,0 +1,66 @@
+package com.sqx.modules.coupon.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class TbCouponLog {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+
+    @ApiModelProperty("平台优惠券记录表")
+    private Long id;
+
+    @ApiModelProperty("优惠券id")
+    private Long couponId;
+
+    @ApiModelProperty("内容")
+    private String content;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("创建人")
+    private Integer createSysUserId;
+
+    @ApiModelProperty("优惠券名称")
+    private String couponName;
+
+    @ApiModelProperty("优惠券图片")
+    private String couponPicture;
+
+    @ApiModelProperty("有效期天数")
+    private Integer endDate;
+
+    @ApiModelProperty("优惠券可使用订单最低金额")
+    private BigDecimal minMoney;
+
+    @ApiModelProperty("优惠券可使用商品类型")
+    private String goodsType;
+
+    @ApiModelProperty("购买此优惠券需要积分数")
+    private Integer needIntegral;
+
+
+    @ApiModelProperty("优惠券金额")
+    private BigDecimal money;
+
+
+    @ApiModelProperty("所属商铺 0为总后台发布的优惠券")
+    private Long shopId;
+
+    @ApiModelProperty("状态:0-待审核，1-发布，2-撤销")
+    private Integer state;
+
+    @ApiModelProperty("用户名")
+    @TableField(exist = false)
+    private String username;
+
+}

src/main/java/com/sqx/modules/coupon/service/TbCouponLogService.java

@@ -0,0 +1,9 @@
+package com.sqx.modules.coupon.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.coupon.entity.TbCouponLog;
+
+public interface TbCouponLogService extends IService<TbCouponLog> {
+    Result selectCouponLog(Integer page, Integer limit);
+}

src/main/java/com/sqx/modules/coupon/service/TbCouponService.java

@@ -11,7 +11,7 @@ public interface TbCouponService extends IService<TbCoupon> {
 
     Result issueCoupon(TbCoupon tbCoupon);
 
-    Result deleteCoupon(Long couponId);
+    Result deleteCoupon(Long couponId,Integer sysUserId);
 
     Result seleteAllCoupon(Integer page, Integer limit,Long shopId,String shopName);
 
@@ -26,4 +26,6 @@ public interface TbCouponService extends IService<TbCoupon> {
     TbCoupon selectCoupon(Long couponId);
 
     Result checkCoupon(Long couponId, Integer sysUserId, Integer state);
+
+    Result selectAdminCoupon(Integer page, Integer limit, Integer state);
 }

src/main/java/com/sqx/modules/coupon/service/impl/TbCouponLogServiceImpl.java

@@ -0,0 +1,27 @@
+package com.sqx.modules.coupon.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.coupon.dao.TbCouponLogDao;
+import com.sqx.modules.coupon.entity.TbCoupon;
+import com.sqx.modules.coupon.entity.TbCouponLog;
+import com.sqx.modules.coupon.service.TbCouponLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TbCouponLogServiceImpl extends ServiceImpl<TbCouponLogDao,TbCouponLog> implements TbCouponLogService {
+
+    @Autowired
+    private TbCouponLogDao tbCouponLogDao;
+
+    @Override
+    public Result selectCouponLog(Integer page, Integer limit) {
+        Page<TbCouponLog> pages = new Page<>(page, limit);
+        PageUtils pageUtils = new PageUtils(tbCouponLogDao.selectCouponLogPage(pages));
+        return Result.success().put("data", pageUtils);
+
+    }
+}

src/main/java/com/sqx/modules/coupon/service/impl/TbCouponServiceImpl.java

@@ -11,11 +11,16 @@ import com.sqx.common.utils.Result;
 import com.sqx.modules.coupon.dao.TbCouponDao;
 import com.sqx.modules.coupon.dao.TbCouponUserDao;
 import com.sqx.modules.coupon.entity.TbCoupon;
+import com.sqx.modules.coupon.entity.TbCouponLog;
+import com.sqx.modules.coupon.service.TbCouponLogService;
 import com.sqx.modules.coupon.service.TbCouponService;
 import com.sqx.modules.datacentre.entity.SysUserShop;
+import com.sqx.modules.sys.entity.SysUserEntity;
 import com.sqx.modules.sys.entity.SysUserRoleEntity;
 import com.sqx.modules.sys.service.SysUserRoleService;
+import com.sqx.modules.sys.service.SysUserService;
 import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +41,12 @@ public class TbCouponServiceImpl extends ServiceImpl<TbCouponDao, TbCoupon> impl
     @Autowired
     private SysUserRoleService sysUserRoleService;
 
+    @Autowired
+    private TbCouponLogService tbCouponLogService;
+
+    @Autowired
+    private SysUserService sysUserService;
+
     @Override
     public Result seleteAllCoupon(Integer page, Integer limit,Long shopId,String shopName) {
         if(page == null || limit==null){
@@ -51,25 +62,53 @@ public class TbCouponServiceImpl extends ServiceImpl<TbCouponDao, TbCoupon> impl
 
     @Override
     public Result issueCoupon(TbCoupon tbCoupon) {
-        Integer sysUserId = tbCoupon.getSysUserId();
+        Long shopId = tbCoupon.getShopId();
+        if (shopId==0) {
+            Integer sysUserId = tbCoupon.getSysUserId();
 //        判断是否是超级管理员
-        LambdaQueryWrapper<SysUserRoleEntity> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(SysUserRoleEntity::getRoleId,3)
-                        .eq(SysUserRoleEntity::getUserId,sysUserId);
-        SysUserRoleEntity sysUserRoleEntity = sysUserRoleService.getOne(wrapper);
-        if (ObjectUtils.isEmpty(sysUserRoleEntity)) {
-            tbCoupon.setState(0);
+            LambdaQueryWrapper<SysUserRoleEntity> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserRoleEntity::getRoleId,3)
+                    .eq(SysUserRoleEntity::getUserId,sysUserId);
+            SysUserRoleEntity sysUserRoleEntity = sysUserRoleService.getOne(wrapper);
+            if (ObjectUtils.isEmpty(sysUserRoleEntity)) {
+                tbCoupon.setState(0);
+            }else {
+                tbCoupon.setState(1);
+            }
+            tbCoupon.setDeleteFlag(0);
+            tbCouponDao.insert(tbCoupon);
+
+            TbCouponLog tbCouponLog = new TbCouponLog();
+            BeanUtils.copyProperties(tbCoupon,tbCouponLog);
+            tbCouponLog.setContent("添加优惠券");
+            tbCouponLog.setCreateTime(new Date());
+            tbCouponLog.setCreateSysUserId(sysUserId);
+            tbCouponLogService.save(tbCouponLog);
+
         }else {
-            tbCoupon.setState(1);
+            tbCoupon.setDeleteFlag(0);
+            tbCouponDao.insert(tbCoupon);
         }
 
-        tbCoupon.setDeleteFlag(0);
-        tbCouponDao.insert(tbCoupon);
+
         return Result.success();
     }
 
     @Override
     public Result updateCoupon(TbCoupon tbCoupon) {
+        Long shopId = tbCoupon.getShopId();
+        if (shopId==0) {
+            Integer sysUserId = tbCoupon.getSysUserId();
+
+            TbCouponLog tbCouponLog = new TbCouponLog();
+            BeanUtils.copyProperties(tbCoupon,tbCouponLog);
+            tbCouponLog.setContent("修改优惠券");
+            tbCouponLog.setCreateTime(new Date());
+            tbCouponLog.setCreateSysUserId(sysUserId);
+            tbCouponLogService.save(tbCouponLog);
+
+        }
+
         tbCouponDao.updateById(tbCoupon);
         return Result.success();
     }
@@ -77,7 +116,7 @@ public class TbCouponServiceImpl extends ServiceImpl<TbCouponDao, TbCoupon> impl
     @Override
     public Result selectCouponList(Integer page, Integer limit,Long shopId) {
         Page<TbCoupon> pages = new Page<>(page, limit);
-        PageUtils pageUtils = new PageUtils(baseMapper.selectPage(pages, new QueryWrapper<TbCoupon>().eq(shopId!=null,"shop_id",shopId).eq("delete_flag", 0)));
+        PageUtils pageUtils = new PageUtils(baseMapper.selectPage(pages, new QueryWrapper<TbCoupon>().eq(shopId!=null,"shop_id",shopId).eq("delete_flag", 0).eq("state",1)));
         return Result.success().put("data", pageUtils);
     }
 
@@ -128,14 +167,59 @@ public class TbCouponServiceImpl extends ServiceImpl<TbCouponDao, TbCoupon> impl
         }
         tbCoupon.setState(state);
         tbCouponDao.updateById(tbCoupon);
+
+        TbCouponLog tbCouponLog = new TbCouponLog();
+        BeanUtils.copyProperties(tbCoupon,tbCouponLog);
+        if (state==1) {
+            tbCouponLog.setContent("发布优惠券");
+        }else {
+            tbCouponLog.setContent("撤销优惠券");
+        }
+        tbCouponLog.setCreateTime(new Date());
+        tbCouponLog.setCreateSysUserId(sysUserId);
+        tbCouponLogService.save(tbCouponLog);
+
         return Result.success();
     }
 
     @Override
-    public Result deleteCoupon(Long couponId) {
+    public Result selectAdminCoupon(Integer page, Integer limit, Integer state) {
+        if(page == null || limit==null){
+            LambdaQueryWrapper<TbCoupon> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(TbCoupon::getShopId,0)
+                    .eq(ObjectUtils.isNotEmpty(state),TbCoupon::getState,state);
+            List<TbCoupon> tbCoupons = baseMapper.selectList(wrapper);
+            return Result.success().put("data",tbCoupons);
+        }else{
+            Page<TbCoupon> pages = new Page<>(page, limit);
+            LambdaQueryWrapper<TbCoupon> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(TbCoupon::getShopId,0)
+                    .eq(ObjectUtils.isNotEmpty(state),TbCoupon::getState,state);
+            PageUtils pageUtils = new PageUtils(baseMapper.selectPage(pages,wrapper));
+            return Result.success().put("data", pageUtils);
+        }
+    }
+
+    @Override
+    public Result deleteCoupon(Long couponId,Integer sysUserId) {
+        TbCoupon tbCoupon = tbCouponDao.selectById(couponId);
+        if (ObjectUtils.isEmpty(tbCoupon)) {
+            return Result.error("无该优惠券");
+        }
+        Long shopId = tbCoupon.getShopId();
+        if (shopId==0) {
+            TbCouponLog tbCouponLog = new TbCouponLog();
+            BeanUtils.copyProperties(tbCoupon,tbCouponLog);
+            tbCouponLog.setContent("删除优惠券");
+            tbCouponLog.setCreateTime(new Date());
+            tbCouponLog.setCreateSysUserId(sysUserId);
+            tbCouponLogService.save(tbCouponLog);
+
+        }
         tbCouponDao.deleteById(couponId);
         return Result.success();
     }
 
 
+
 }

src/main/java/com/sqx/modules/datacentre/controller/RiderBankCardInfoController.java

@@ -0,0 +1,56 @@
+package com.sqx.modules.datacentre.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.datacentre.entity.RiderBankCardInfo;
+import com.sqx.modules.datacentre.service.RiderBankCardInfoService;
+import com.sqx.modules.shop.entity.ShopBankCardInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@Api(tags={"骑手银行卡信息"})
+@RestController
+@RequestMapping("/rider/bank")
+public class RiderBankCardInfoController {
+
+    @Autowired
+    private RiderBankCardInfoService riderBankCardInfoService;
+
+    @ApiOperation("新增骑手银行卡信息")
+    @PostMapping("/save")
+    public Result saveCardInfo(@Valid @RequestBody RiderBankCardInfo riderBankCardInfo) {
+        return riderBankCardInfoService.saveCardInfo(riderBankCardInfo);
+    }
+
+    @ApiOperation("查询单个骑手银行卡信息")
+    @GetMapping("/getUserId")
+    public Result getUserIdCardInfo(Long userId) {
+        return riderBankCardInfoService.getUserIdCardInfo(userId);
+    }
+
+    @ApiOperation("编辑骑手银行卡信息")
+    @PostMapping("/update")
+    public Result updateCardInfo(@Valid @RequestBody RiderBankCardInfo riderBankCardInfo) {
+        Long id = riderBankCardInfo.getId();
+        if (ObjectUtils.isEmpty(id)) {
+            return riderBankCardInfoService.saveCardInfo(riderBankCardInfo);
+        }
+        riderBankCardInfoService.updateById(riderBankCardInfo);
+        return Result.success();
+    }
+
+    @ApiOperation("删除骑手银行卡信息")
+    @GetMapping("/delete")
+    public Result deleteIdCardInfo(Long id) {
+        riderBankCardInfoService.removeById(id);
+
+        return Result.success();
+    }
+
+
+
+}

src/main/java/com/sqx/modules/datacentre/dao/RiderBankCardInfoDao.java

@@ -0,0 +1,9 @@
+package com.sqx.modules.datacentre.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sqx.modules.datacentre.entity.RiderBankCardInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RiderBankCardInfoDao extends BaseMapper<RiderBankCardInfo> {
+}

src/main/java/com/sqx/modules/datacentre/entity/RiderBankCardInfo.java

@@ -0,0 +1,62 @@
+package com.sqx.modules.datacentre.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+
+@Data
+@ApiModel(value = "骑手银行卡信息",description = "")
+@TableName("rider_bank_card_info")
+public class RiderBankCardInfo {
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(name = "id")
+    private Long id;
+    /**
+     * 骑手id
+     */
+    @ApiModelProperty(name = "骑手id")
+    @NotNull(message = "骑手id不能为空")
+    private Long userId;
+    /**
+     * 卡号
+     */
+    @ApiModelProperty(name = "卡号")
+    @NotBlank(message = "卡号不能为空")
+    private String cardNo;
+    /**
+     * 开户行
+     */
+    @ApiModelProperty(name = "开户行")
+    @NotBlank(message = "开户行不能为空")
+    private String openBank;
+    /**
+     * 户主名称
+     */
+    @ApiModelProperty(name = "户主名称")
+    @NotBlank(message = "户主名称不能为空")
+    private String realName;
+    /**
+     * 银行名称
+     */
+    @ApiModelProperty(name = "银行名称")
+    @NotBlank(message = "银行名称不能为空")
+    private String bankName;
+    /**
+     * 删除标识;1 是 0否
+     */
+    @TableLogic(delval = "1", value = "0")
+    @ApiModelProperty(name = "删除标识", notes = "1 是 0否")
+    @Pattern(regexp = "(0|1)", message = "删除标识只能为0或1")
+    private String delFlag;
+}

src/main/java/com/sqx/modules/datacentre/service/RiderBankCardInfoService.java

@@ -0,0 +1,11 @@
+package com.sqx.modules.datacentre.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.datacentre.entity.RiderBankCardInfo;
+
+public interface RiderBankCardInfoService extends IService<RiderBankCardInfo> {
+    Result saveCardInfo(RiderBankCardInfo riderBankCardInfo);
+
+    Result getUserIdCardInfo(Long userId);
+}

src/main/java/com/sqx/modules/datacentre/service/impl/RiderBankCardInfoServiceImpl.java

@@ -0,0 +1,39 @@
+package com.sqx.modules.datacentre.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.Result;
+import com.sqx.modules.datacentre.dao.RiderBankCardInfoDao;
+import com.sqx.modules.datacentre.entity.RiderBankCardInfo;
+import com.sqx.modules.datacentre.service.RiderBankCardInfoService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RiderBankCardInfoServiceImpl extends ServiceImpl<RiderBankCardInfoDao, RiderBankCardInfo> implements RiderBankCardInfoService {
+
+    @Override
+    public Result saveCardInfo(RiderBankCardInfo riderBankCardInfo) {
+        Long userId = riderBankCardInfo.getUserId();
+
+        LambdaQueryWrapper<RiderBankCardInfo> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(RiderBankCardInfo::getUserId,userId);
+        RiderBankCardInfo cardInfo = this.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(cardInfo)) {
+            return Result.error("该银行卡信息已存在");
+        }
+
+        this.save(riderBankCardInfo);
+
+        return Result.success();
+    }
+
+    @Override
+    public Result getUserIdCardInfo(Long userId) {
+        LambdaQueryWrapper<RiderBankCardInfo> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(RiderBankCardInfo::getUserId,userId);
+        RiderBankCardInfo riderBankCardInfo = this.getOne(wrapper);
+        return Result.success().put("data",riderBankCardInfo);
+    }
+}

src/main/java/com/sqx/modules/order/entity/TbOrder.java

@@ -282,10 +282,6 @@ public class TbOrder implements Serializable {
     @ApiModelProperty("站点名称")
     private String stationName;
 
-    @ApiModelProperty("是否发送成功 1发送成功 0发送失败")
-    @TableField(exist = false)
-    private String successFlag;
-
     @ApiModelProperty("超时时间")
     private Long timeOut;
 

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1491,26 +1491,6 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
     @Override
     public Result selectOrderById(Long orderId) {
         TbOrder tbOrder = appOrderDao.selectByOrderId(orderId);
-//        短信的orderId对应骑手订单id
-        LambdaQueryWrapper<TbIndent> wrapperTBI=new LambdaQueryWrapper<>();
-        wrapperTBI.eq(TbIndent::getOrderId,tbOrder.getOrderId());
-        TbIndent tbIndent = tbIndentService.getOne(wrapperTBI);
-        if (ObjectUtils.isNotEmpty(tbIndent)) {
-            //        只能单独去搜索短信发送结果
-            LambdaQueryWrapper<TbIndentSmsSendLog> wrapper=new LambdaQueryWrapper<>();
-            wrapper.eq(TbIndentSmsSendLog::getOrderId,tbIndent.getIndentId())
-                    .eq(TbIndentSmsSendLog::getSuccessFlag,"1");
-            List<TbIndentSmsSendLog> list = smsSendLogService.list(wrapper);
-            //        只要有发送成功记录就是成功
-            if (list.size()>0) {
-                tbOrder.setSuccessFlag("1");
-            }else {
-                tbOrder.setSuccessFlag("0");
-            }
-        }else {
-            tbOrder.setSuccessFlag("0");
-        }
-
 
         int i = appOrderDao.selectCountOrderByTime(tbOrder.getPayTime(), tbOrder.getShopId());
         tbOrder.setCountOrder(i);

src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java

@@ -1,7 +1,9 @@
 package com.sqx.modules.pay.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.constant.RedisKey;
@@ -19,7 +21,9 @@ import com.sqx.modules.app.service.UserMoneyDetailsService;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.common.entity.CommonInfo;
 import com.sqx.modules.common.service.CommonInfoService;
+import com.sqx.modules.datacentre.entity.RiderBankCardInfo;
 import com.sqx.modules.datacentre.query.DataCenterQuery;
+import com.sqx.modules.datacentre.service.RiderBankCardInfoService;
 import com.sqx.modules.errand.dao.ErrandComplaintDao;
 import com.sqx.modules.errand.dao.TbIndentDao;
 import com.sqx.modules.errand.entity.ErrandComplaint;
@@ -101,7 +105,8 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
     private ShopBankCardInfoService shopBankCardInfoService;
     @Autowired
     private RedissonClient redissonClient;
-
+    @Autowired
+    private RiderBankCardInfoService riderBankCardInfoService;
 
 
     @Override
@@ -392,6 +397,17 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
 
         // 用户提现
         if (type == 1) {
+//          骑手银行卡信息
+            LambdaQueryWrapper<RiderBankCardInfo> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(RiderBankCardInfo::getUserId,userId);
+            RiderBankCardInfo riderBankCardInfo = riderBankCardInfoService.getOne(wrapper);
+            if (ObjectUtils.isEmpty(riderBankCardInfo)) {
+                throw new SqxException("银行卡信息不存在，请联系客服人员添加");
+            }
+            cashOut.setBankRealName(riderBankCardInfo.getRealName());
+            cashOut.setOpenBank(riderBankCardInfo.getOpenBank());
+            cashOut.setBankCardNo(riderBankCardInfo.getCardNo());
+
             //用户提现手续费
             CommonInfo one1 = commonInfoService.findOne(114);
             Double value = Double.valueOf(one1.getValue());
@@ -403,6 +419,18 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
         }
         // 骑手提现
         else if(type == 3){
+//          骑手银行卡信息
+            LambdaQueryWrapper<RiderBankCardInfo> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(RiderBankCardInfo::getUserId,userId);
+            RiderBankCardInfo riderBankCardInfo = riderBankCardInfoService.getOne(wrapper);
+            if (ObjectUtils.isEmpty(riderBankCardInfo)) {
+                throw new SqxException("银行卡信息不存在，请联系客服人员添加");
+            }
+            cashOut.setBankRealName(riderBankCardInfo.getRealName());
+            cashOut.setOpenBank(riderBankCardInfo.getOpenBank());
+            cashOut.setBankCardNo(riderBankCardInfo.getCardNo());
+
+
             //骑手提现手续费
             CommonInfo one1 = commonInfoService.findOne(114);
             Double value = Double.valueOf(one1.getValue());

src/main/resources/mapper/coupon/TbCouponLogMapper.xml

@@ -0,0 +1,14 @@
+<?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.sqx.modules.coupon.dao.TbCouponLogDao">
+
+    <select id="selectCouponLogPage" resultType="com.sqx.modules.coupon.entity.TbCouponLog">
+        SELECT
+            tcl.*,
+            su.username
+        FROM
+            `tb_coupon_log` tcl
+                LEFT JOIN sys_user su ON su.user_id = tcl.create_sys_user_id
+        ORDER BY create_time DESC
+    </select>
+</mapper>

src/main/resources/mapper/pay/CashDao.xml

@@ -298,7 +298,7 @@
     </sql>
 
     <select id="selectCashOutList" resultType="com.sqx.modules.pay.vo.CashOutVO">
-        select gh.shop_name, co.*,rs.station_name as stationName
+        select gh.shop_name, co.*,rs.station_name as stationName,tu.user_name as userName
         from cash_out co
         left join goods_shop gh on gh.shop_id = co.shop_id
         left join tb_user tu on tu.user_id=co.user_id