Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/UserBankCardSearch.java

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * @Author: liweifan
@@ -11,4 +13,14 @@ import io.swagger.annotations.ApiModel;
 public class UserBankCardSearch extends QueryInfo{
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty("用户id ")
+	private Long userId;
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/UserBankCard.java

@@ -147,29 +147,27 @@ public class UserBankCard implements Serializable {
         this.updateTime = updateTime;
     }
 /**
- 工商银行   ICBC
- 建设银行   CCB
- 邮政储蓄银行   PSBC
+ 中国人民银行   PBC
+ 中国进出口银行   EIBC
+ 中国农业发展银行   ADBC
+ 国家开发银行   CDB
+ 中国工商银行   ICBC
+ 中国建设银行   CCB
+ 中国农业银行   ABC
+ 中国民生银行   CMB
+ 中国光大银行   CEB
+ 中国邮政储蓄银行   PSBC
  中国银行   BOC
- 农业银行   ABC
- 通银行   BC
- 招商银行   CMB
-汇丰银行   HSBC
-交
-中国民生银行   CMB
-上海浦东发展银行   SPDB
-中信银行   无英文简写
-中国光大银行   CEB
-华夏银行   HB
-广东发展银行   GDB
-深圳发展银行   SDB
-兴业银行   CIB
-国家开发银行   CDB
-中国进出口银行   EIBC
-中国农业发展银行   ADBC
-北京银行   BOB
-中国人民银行   PBC
-
+ 汇丰银行   HSBC
+ 交通银行   BCM
+ 招商银行   CMBC
+ 中信银行   CCTCB
+ 兴业银行   CIB
+ 华夏银行   HXB
+ 广东发展银行   GDB
+ 上海浦东发展银行   SPDB
+ 深圳发展银行   SDB
+ 北京银行   BOB
  */
 
     

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/VipCard.java

@@ -1,121 +0,0 @@
-package com.yonge.cooleshow.biz.dal.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yonge.cooleshow.biz.dal.enums.TimeTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-/**
- * 会员卡表
- */
-@TableName("vip_card")
-@ApiModel(value = "VipCard对象", description = "会员卡表")
-public class VipCard implements Serializable {
-	private static final long serialVersionUID = 1L;
-    @ApiModelProperty("会员卡id ")
-    @TableId(value = "id_")
-    private Long id;
-    @ApiModelProperty("时长类型：MONTH、月卡 QUARTER、季卡 YEAR、年卡 ")
-	@TableField(value = "time_type_")
-    @NotNull(message = "时长类型不能为空")
-    private TimeTypeEnum timeType;
-    @ApiModelProperty("原价 ")
-	@TableField(value = "original_price_")
-    @NotNull(message = "原价不能为空")
-    private BigDecimal originalPrice;
-    @ApiModelProperty("实际价格 ")
-	@TableField(value = "actual_price_")
-    @NotNull(message = "实际价格不能为空")
-    private BigDecimal actualPrice;
-    @ApiModelProperty("创建时间 ")
-	@TableField(value = "create_time_")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date createTime;
-    @ApiModelProperty("创建人 ")
-	@TableField(value = "create_by__")
-    private Long createBy;
-    @ApiModelProperty("更新时间 ")
-	@TableField(value = "update_time_")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date updateTime;
-    @ApiModelProperty("更新人 ")
-	@TableField(value = "update_by_")
-    private Long updateBy;
-
-	public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public TimeTypeEnum getTimeType() {
-        return timeType;
-    }
-
-    public void setTimeType(TimeTypeEnum timeType) {
-        this.timeType = timeType;
-    }
-
-    public BigDecimal getOriginalPrice() {
-        return originalPrice;
-    }
-
-    public void setOriginalPrice(BigDecimal originalPrice) {
-        this.originalPrice = originalPrice;
-    }
-    
-	public BigDecimal getActualPrice() {
-        return actualPrice;
-    }
-
-    public void setActualPrice(BigDecimal actualPrice) {
-        this.actualPrice = actualPrice;
-    }
-    
-	public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-    
-	public Long getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(Long createBy) {
-        this.createBy = createBy;
-    }
-    
-	public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-    
-	public Long getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(Long updateBy) {
-        this.updateBy = updateBy;
-    }
-    
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MemberPriceSettingsServiceImpl.java

@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderReq;
 import com.yonge.cooleshow.biz.dal.entity.VipCardRecord;
 import com.yonge.cooleshow.biz.dal.enums.PeriodEnum;
-import com.yonge.cooleshow.biz.dal.enums.TimeTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.VipCardRecordService;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
-import com.yonge.cooleshow.biz.dal.vo.VipCardVo;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import org.springframework.beans.factory.annotation.Autowired;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderVo.java

@@ -1,7 +1,9 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yonge.cooleshow.biz.dal.entity.UserOrder;
 import com.yonge.cooleshow.biz.dal.entity.UserOrderDetail;
+import com.yonge.cooleshow.biz.dal.enums.PayChannelEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -25,6 +27,8 @@ public class UserOrderVo extends UserOrder {
 	private String username;
 	@ApiModelProperty(value = "手机号")
 	private String phone;
+	@ApiModelProperty("支付渠道:  alipay 支付宝  wx_lite 微信 ")
+	private PayChannelEnum payChannel;
 
 	public List<UserOrderDetailVo> getOrderDetailList() {
 		return orderDetailList;
@@ -65,4 +69,12 @@ public class UserOrderVo extends UserOrder {
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}
+
+	public PayChannelEnum getPayChannel() {
+		return payChannel;
+	}
+
+	public void setPayChannel(PayChannelEnum payChannel) {
+		this.payChannel = payChannel;
+	}
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/VipCardVo.java

@@ -1,45 +0,0 @@
-package com.yonge.cooleshow.biz.dal.vo;
-
-import com.yonge.cooleshow.biz.dal.entity.VipCard;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.beanutils.BeanUtils;
-
-/**
- * @Author: liweifan
- * @Data: 2022-04-13 13:36:48
- */
-@ApiModel(value = "VipCardVo对象", description = "会员卡表查询视图对象")
-public class VipCardVo extends VipCard{
-	private static final long serialVersionUID = 1L;
-    @ApiModelProperty("时长类型名称 ")
-    private String timeTypeName;
-    @ApiModelProperty("修改人名称 ")
-    private String updateByName;
-
-    public String getTimeTypeName() {
-        return timeTypeName;
-    }
-
-    public void setTimeTypeName(String timeTypeName) {
-        this.timeTypeName = timeTypeName;
-    }
-
-    public String getUpdateByName() {
-        return updateByName;
-    }
-
-    public void setUpdateByName(String updateByName) {
-        this.updateByName = updateByName;
-    }
-
-    public VipCardVo buildVo(VipCard vipCard){
-        try {
-            BeanUtils.copyProperties(this,vipCard);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return this;
-    }
-
-}

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -41,7 +41,7 @@
 
     <select id="queryTeacherTotal" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo">
         select a.*,b.starGrade from (
-            <!-- 统计查询已上课时数，未上课时数 -->
+            <!-- 统计查询已上课时数,未上课时数 -->
             select
                 a.teacher_id_ as userId,
                 sum(if(a.end_time_ &lt;= now(),1,0)) as expTime,

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserBankCardMapper.xml

@@ -36,11 +36,14 @@
         where t.del_flag_ = 0 and t.id_ = #{id}
     </select>
     
-    <select id="selectPage" resultMap="BaseResultMap">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.UserBankCardVo">
 		SELECT         
         	<include refid="baseColumns" />
 		FROM user_bank_card t
 		where t.del_flag_ = 0
+        <if test="param.userId !=null">
+            AND t.user_id_ = #{param.userId}
+        </if>
 	</select>
 
     <select id="getDefaultBankByUserId" resultType="com.yonge.cooleshow.biz.dal.vo.UserBankCardVo">

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -68,7 +68,9 @@
             , t.coupon_amount_ as couponAmount
             , t.user_note_ as userNote
             , t.pay_time_ as payTime
-            ，p.trans_no_ as transNo
+            , t.create_time_ as createTime
+            , p.trans_no_ as transNo
+            , p.pay_channel_ as payChannel
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_
         left join sys_user u on t.user_id_ = u.id_

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserWithdrawalMapper.xml

@@ -51,7 +51,7 @@
             ) as verifyUser
         FROM user_withdrawal t
         left join sys_user u on u.id_ = t.user_id_
-        LEFT JOIN user_bank_card bc on t.bank_card_ = bc.bank_card_
+        LEFT JOIN user_bank_card bc on t.bank_card_ = bc.bank_card_ and bc.del_flag_ = 0
         <where>
             <if test="null != param.search and '' != param.search">
                 AND (

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MemberPriceSettingsController.java

@@ -20,7 +20,6 @@ import java.util.Map;
 @Api(tags = "会员价格设置")
 @RestController
 public class MemberPriceSettingsController extends BaseController {
-
 	@Autowired
 	private MemberPriceSettingsService memberPriceSettingsService;
 	@Autowired

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserAccountController.java

@@ -45,8 +45,8 @@ public class UserAccountController extends BaseController {
 	/**
      * 查询单条
      */
-    @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入id")
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情")
     public HttpResponseResult<UserAccountVo> detail() {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserBankCardController.java

@@ -1,12 +1,19 @@
 package com.yonge.cooleshow.teacher.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.UserBankCardDto;
+import com.yonge.cooleshow.biz.dal.dto.search.UserBankCardSearch;
+import com.yonge.cooleshow.biz.dal.entity.SysConfig;
 import com.yonge.cooleshow.biz.dal.entity.UserBankCard;
+import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.service.UserBankCardService;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.UserBankCardVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +21,9 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("/userBankCard")
@@ -23,6 +33,33 @@ public class UserBankCardController extends BaseController {
     private UserBankCardService userBankCardService;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private SysConfigService sysConfigService;
+
+	@PostMapping("/bankList")
+	@ApiOperation(value = "查询银行")
+	public HttpResponseResult<List<SysConfig>> bankList() {
+		Map<String,Object> params = new HashMap<>();
+		params.put("group", "BANK");
+		List<SysConfig> configs = sysConfigService.findAll(params);
+		return succeed(configs);
+	}
+
+	/**
+	 * 查询分页
+	 */
+	@PostMapping("/page")
+	@ApiOperation(value = "查询分页", notes = "传入userBankCardSearch")
+	public HttpResponseResult<PageInfo<UserBankCardVo>> page(@RequestBody UserBankCardSearch query) {
+		SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null || null == user.getId()) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+		query.setUserId(user.getId());
+
+		IPage<UserBankCardVo> pages = userBankCardService.selectPage(PageUtil.getPage(query), query);
+		return succeed(PageUtil.pageInfo(pages));
+	}
 
 	@PostMapping("/bankCard")
 	@ApiOperation(value = "用户绑卡")