Merge branch 'feature/0721-tenant'

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -118,7 +118,7 @@ public class NewsController extends BaseController {
 					return failed("封面不能为空");
 				}
 			} else if ("VIDEO".equals(newsInfo.getAttribute2())){
-				if (StringUtil.isEmpty(newsInfo.getLinkUrl())) {
+				if (StringUtil.isEmpty(newsInfo.getVideoCoverImage())) {
 					return failed("视频地址不能为空");
 				}
 			}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserPaymentClient.java

@@ -15,6 +15,8 @@ import com.yeepay.g3.sdk.yop.utils.DigitalEnvelopeUtils;
 import com.yeepay.g3.sdk.yop.utils.RSAKeyUtils;
 import com.yonge.cooleshow.biz.dal.entity.PaymentMerchantConfig;
 import com.yonge.cooleshow.biz.dal.entity.TenantMember;
+import com.yonge.cooleshow.biz.dal.entity.UserOrderRefund;
+import com.yonge.cooleshow.biz.dal.entity.UserOrderRefundBill;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
@@ -57,6 +59,8 @@ public class UserPaymentClient {
     @Autowired
     private PaymentMerchantConfigService paymentMerchantConfigService;
 
+    @Autowired
+    private UserOrderRefundBillService userOrderRefundBillService;
     /**
      * 支付消息回调
      * @param request HttpServletRequest
@@ -77,7 +81,7 @@ public class UserPaymentClient {
         log.info("payment vendor={}, paymentResp={}", vendor, JSON.toJSONString(paymentResp));
         // 支付订单确认
         UserPaymentOrderWrapper.UserPaymentOrder paymentOrder = userPaymentOrderService
-                .getUserPaymentOrderByOrderNo(paymentResp.getTransNo(), paymentResp.getMerOrderNo());
+                .getUserPaymentOrderByOrderNo( paymentResp.getMerOrderNo());
         if (Objects.isNull(paymentOrder)) {
             return paymentResp.getMsg();
         }
@@ -114,6 +118,38 @@ public class UserPaymentClient {
     }
 
 
+    /**
+     * 退款消息回调
+     * @param request HttpServletRequest
+     * @return String
+     */
+    @ApiOperation(value = "退款消息回调", notes = "三方支付平台退款消息通知")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "vendor", value = "服务提供方", dataType = "String")
+    })
+    @RequestMapping(value = "/refund/callback/{vendor}", method = {RequestMethod.GET, RequestMethod.POST})
+    public String refund(@PathVariable("vendor") String vendor, HttpServletRequest request) {
+
+        RefundResp refundResp = paymentServiceContext.getPaymentService(vendor).callbackNotifyForRefund(request);
+        if (Objects.isNull(refundResp)) {
+            log.info("refund REFUND_FAILED, vendor={}", vendor);
+            return null;
+        }
+        log.info("refund vendor={}, refundResp={}", vendor, JSON.toJSONString(refundResp));
+
+        // 退款订单确认
+        UserOrderRefundBill refundBill = userOrderRefundBillService.getByTransNoOrOrderNo(refundResp.getTransNo(), refundResp.getMerOrderNo());
+        if (Objects.isNull(refundBill)) {
+            log.warn("refund REFUND_FAILED, vendor={}, refundResp={}", vendor, JSON.toJSONString(refundResp));
+            return refundResp.getMsg();
+        }
+
+        // 执行退款回调流程
+        userPaymentCoreService.refundPaymentCallback(refundResp);
+
+        return paymentServiceContext.getPaymentService(vendor).returnNotifyResult(request);
+    }
+
     @PostMapping("/callback/adapay")
     public String callback(HttpServletRequest request) {
         try {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/UserOrderRefundBillDao.java

@@ -26,5 +26,6 @@ public interface UserOrderRefundBillDao extends BaseMapper<UserOrderRefundBill>{
      * @return: com.yonge.cooleshow.biz.dal.vo.UserOrderRefundPaymentVo
 	 */
 	List<UserOrderRefundBillVo> selectPage(@Param("page") IPage page, @Param("param") UserOrderRefundPaymentSearch userOrderRefundPayment);
-	
+
+    UserOrderRefundBill getByTransNoOrOrderNo(@Param("transNo") String transNo, @Param("refundOrderNo") String refundOrderNo);
 }

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

@@ -79,4 +79,8 @@ public class TenantApplyRecord implements Serializable {
 	@TableField(value = "create_time_")
     private Date createTime;
 
+    @ApiModelProperty("群简介")
+    @TableField(value = "brief_Introduction_")
+    private String briefIntroduction;
+
 }

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

@@ -26,4 +26,6 @@ public interface UserOrderRefundBillService extends IService<UserOrderRefundBill
  	 * @date 2022-05-09
      */
     IPage<UserOrderRefundBillVo> selectPage(IPage<UserOrderRefundBillVo> page, UserOrderRefundPaymentSearch query);
+
+    UserOrderRefundBill getByTransNoOrOrderNo(String transNo, String refundOrderNo);
 }

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.microsvc.toolkit.config.jwt.utils.JwtUserInfo;
 import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentResp;
+import com.microsvc.toolkit.middleware.payment.common.api.entity.RefundResp;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.common.enums.payment.EPaymentType;
 import org.springframework.transaction.annotation.Transactional;
@@ -76,4 +77,12 @@ public interface UserPaymentCoreService {
      * @param payTypeReq UserPaymentOrderWrapper.OrderPayTypeReq
      */
     UserPaymentOrderWrapper.OrderPayTypeResp orderPayType(UserPaymentOrderWrapper.OrderPayTypeReq payTypeReq);
+
+    /**
+     * 退款回调
+     *
+     */
+    void refundPaymentCallback(RefundResp refundResp);
+
+    void refundPayment(String orderNo,  String reason);
 }

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

@@ -28,7 +28,7 @@ public interface UserPaymentOrderService   {
      * @param merOrderNo 订单编号
      * @return UserPaymentOrder
      */
-    UserPaymentOrderWrapper.UserPaymentOrder getUserPaymentOrderByOrderNo(String transNo, String merOrderNo);
+    UserPaymentOrderWrapper.UserPaymentOrder getUserPaymentOrderByOrderNo( String merOrderNo);
 
     /**
      * 用户支付订单

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.microsvc.toolkit.config.jwt.utils.JwtUserInfo;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.constant.CourseConstant;
@@ -26,6 +27,7 @@ import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.coupon.CouponOrderWrapper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.enums.EPaymentVersion;
 import com.yonge.cooleshow.common.enums.PostStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
@@ -110,6 +112,9 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
     @Autowired
     private PlatformCashAccountRecordService platformCashAccountRecordService;
 
+    @Autowired
+    private UserPaymentCoreService userPaymentCoreService;
+
     @Override
     public CourseGroupDao getDao() {
         return this.baseMapper;
@@ -1296,14 +1301,19 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
     private void refund(CourseGroup courseGroup) {
         // 退款
         List<String> orderNoList = courseScheduleStudentPaymentService.getOrderNoByGroupId(courseGroup.getId());
-        for (String orderNo : orderNoList) {
+        Collection<UserOrder> userOrders = userOrderService.listByIds(orderNoList);
+        for (UserOrder order : userOrders) {
             try {
-                userOrderRefundService.orderRefund(orderNo, "直播课成课失败退款");
+                if (order.getPaymentVersion().equals(EPaymentVersion.V1)) {
+                    userOrderRefundService.orderRefund(order.getOrderNo(), "直播课成课失败退款");
+                } else {
+                    userPaymentCoreService.refundPayment(order.getOrderNo(),"直播课成课失败退款");
+                }
 
                 //退还优惠券
-                couponInfoService.updateUserOrderCouponInfo(CouponOrderWrapper.builder().orderNo(orderNo).reset(true).build());
+                couponInfoService.updateUserOrderCouponInfo(CouponOrderWrapper.builder().orderNo(order.getOrderNo()).reset(true).build());
             } catch (Exception e) {
-                log.warn("直播课成课失败退款 退款失败，退款订单号 {}", orderNo);
+                log.warn("直播课成课失败退款 退款失败，退款订单号 {}", order);
                 log.error("直播课成课失败退款 退款失败", e.getCause());
             }
         }

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

@@ -25,5 +25,11 @@ public class UserOrderRefundBillServiceImpl extends ServiceImpl<UserOrderRefundB
     public IPage<UserOrderRefundBillVo> selectPage(IPage<UserOrderRefundBillVo> page, UserOrderRefundPaymentSearch query){
         return page.setRecords(baseMapper.selectPage(page, query));
     }
-	
+
+    @Override
+    public UserOrderRefundBill getByTransNoOrOrderNo(String transNo, String refundOrderNo) {
+
+        return baseMapper.getByTransNoOrOrderNo(transNo, refundOrderNo);
+    }
+
 }

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

@@ -12,16 +12,10 @@ import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.microsvc.toolkit.config.jwt.utils.JwtUserInfo;
 import com.microsvc.toolkit.middleware.payment.common.api.BasePaymentService;
 import com.microsvc.toolkit.middleware.payment.common.api.PaymentServiceContext;
-import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentClose;
-import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentOrder;
-import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentReq;
-import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentResp;
+import com.microsvc.toolkit.middleware.payment.common.api.entity.*;
 import com.microsvc.toolkit.middleware.payment.common.api.enums.PaymentStatus;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
@@ -32,6 +26,7 @@ import com.yonge.cooleshow.common.enums.*;
 import com.yonge.cooleshow.common.enums.payment.EPaymentChannel;
 import com.yonge.cooleshow.common.enums.payment.EPaymentStatus;
 import com.yonge.cooleshow.common.enums.payment.EPaymentType;
+import com.yonge.toolset.payment.base.enums.TradeStatusEnum;
 import com.yonge.toolset.payment.util.DistributedLock;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
@@ -124,6 +119,14 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
     @Autowired
     private PaymentMerchantConfigService paymentMerchantConfigService;
 
+    @Autowired
+    private UserOrderRefundService userOrderRefundService;
+
+    @Autowired
+    private UserOrderRefundBillService userOrderRefundBillService;
+
+
+
 
     // 订单商品参数校验，获取订单支付金额
     private static final Map<GoodTypeEnum, Consumer<UserPaymentOrderWrapper.OrderGoodsInfo>> orderGoodsCreate = Maps.newHashMap();
@@ -209,7 +212,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
         DistributedLock.of(redissonClient).runIfLockCanGet(lockName, () -> {
 
             // 获取订单信息
-            UserPaymentOrderWrapper.UserPaymentOrder paymentOrder = userPaymentOrderService.getUserPaymentOrderByOrderNo(paymentResp.getTransNo(), paymentResp.getMerOrderNo());
+            UserPaymentOrderWrapper.UserPaymentOrder paymentOrder = userPaymentOrderService.getUserPaymentOrderByOrderNo( paymentResp.getMerOrderNo());
             if (Objects.isNull(paymentOrder)) {
                 log.error("executePaymentCallback 无效的支付订单, paymentResp={}", JSON.toJSONString(paymentResp));
                 throw new BizException("无效的支付订单");
@@ -1017,6 +1020,48 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
     }
 
     /**
+     * 退款回调
+     *
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void refundPaymentCallback(RefundResp refundResp) {
+
+        String lockName = redisCacheService.getPaymentCacheKey(refundResp.getMerOrderNo());
+        // 并发执行锁
+        DistributedLock.of(redissonClient).runIfLockCanGet(lockName, () -> {
+            // 退款订单确认
+            UserOrderRefundBill refundOrder = userOrderRefundBillService.getByTransNoOrOrderNo(refundResp.getTransNo(), refundResp.getMerOrderNo());
+            if (Objects.isNull(refundOrder)) {
+                throw new com.yonge.toolset.base.exception.BizException("退款订单不存在");
+            }
+
+            refundOrder.setUpdateTime(new Date());
+            refundOrder.setTransNo(refundResp.getTransNo());
+            // 退款申请失败
+            if (PaymentStatus.FAILED == refundResp.getPaymentStatus()) {
+
+                // 更新用户退款订单状态
+                refundOrder.setStatus(TradeStatusEnum.failed);
+                refundOrder.setPayFailMsg(refundResp.getMsg());
+            }
+
+            // 退款处理已完成,本地订单状态未同步
+            if (PaymentStatus.SUCCESSED == refundResp.getPaymentStatus()) {
+
+                refundOrder.setBackRefundAmt(refundResp.getRefundAmount());
+                refundOrder.setStatus(TradeStatusEnum.succeeded);
+            }
+            userOrderRefundBillService.updateById(refundOrder);
+
+
+        }, 60L, TimeUnit.SECONDS);
+
+
+        log.info("refundPaymentCallback refundResp={}", JSON.toJSONString(refundResp));
+    }
+
+    /**
      * 定时更新订单状态
      * @param page IPage<UserPaymentOrderWrapper.UserPaymentOrder>
      * @param orderQuery UserPaymentOrderWrapper.UserPaymentOrderQuery
@@ -1101,4 +1146,70 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
         //log.info("scheduleUpdatePaymentOrderStatus PAYMENT_FINISH ------> ");
     }
 
+
+    /**
+     * 用户申请退款
+     *
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void refundPayment(String orderNo, String reason) {
+
+        // 查询订单信息，支付状态
+        UserPaymentOrderWrapper.UserPaymentOrder paymentOrder = userPaymentOrderService.getUserPaymentOrderByOrderNo(orderNo);
+        if (Objects.isNull(paymentOrder)) {
+            throw new BizException("订单信息不存在");
+        }
+        if (!OrderStatusEnum.PAID.getCode().equals(paymentOrder.getStatus().getCode())) {
+            throw  new BizException("订单状态异常");
+        }
+
+
+        // 执行状态锁定
+        String lockName = redisCacheService.getExecuteOrderCacheKey(paymentOrder.getUserId().toString());
+        DistributedLock.of(redissonClient).runIfLockCanGet(lockName, () -> {
+            // 提交退款申请记录
+            UserOrderRefund userRefundOrder = new UserOrderRefund();
+            userRefundOrder.setUserId(paymentOrder.getId());
+            userRefundOrder.setOrderId(paymentOrder.getId());
+            userRefundOrder.setOrderNo(paymentOrder.getOrderNo());
+            userRefundOrder.setOredrDetilIds(paymentOrder.getTransNo());
+            userRefundOrder.setStatus(AuthStatusEnum.PASS);
+            userRefundOrder.setApplyAmount(paymentOrder.getPaymentCashAmount());
+            userRefundOrder.setActualAmount(paymentOrder.getPaymentCouponAmount());
+            userRefundOrder.setReason(reason);
+            userOrderRefundService.save(userRefundOrder);
+
+            //入退款单表
+            UserOrderRefundBill orderRefundBill = new UserOrderRefundBill();
+            orderRefundBill.setRefundId(userRefundOrder.getId());
+            orderRefundBill.setBillNo(IdWorker.getIdStr());
+            orderRefundBill.setRefundAmt(userRefundOrder.getActualAmount());
+
+
+            RefundOrder refundOrder = new RefundOrder();
+            refundOrder.setUserId(paymentOrder.getUserId().toString());
+            refundOrder.setMerOrderNo(orderRefundBill.getBillNo());
+            refundOrder.setRefundAmount(orderRefundBill.getRefundAmt());
+            refundOrder.setOrderAmount(paymentOrder.getPaymentCashAmount());
+            refundOrder.setReason(reason);
+            refundOrder.setPaymentOrderNo(paymentOrder.getOrderNo());
+            RefundResp refundResp = paymentServiceContext.getPaymentService(paymentOrder.getPaymentVendor()).refund(refundOrder);
+            // 申请请求失败
+            if (PaymentStatus.FAILED == refundResp.getPaymentStatus()) {
+                orderRefundBill.setStatus(TradeStatusEnum.failed);
+                orderRefundBill.setPayFailMsg(refundResp.getMsg());
+            } else {
+                orderRefundBill.setTransNo(refundResp.getTransNo());
+                orderRefundBill.setStatus(TradeStatusEnum.pending);
+            }
+            userOrderRefundBillService.save(orderRefundBill);
+
+            //处理退款业务
+           userOrderRefundService.orderRefundSuccessBizHandle(userRefundOrder.getId());
+
+        }, 10L, TimeUnit.SECONDS);
+
+    }
+
 }

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

@@ -46,12 +46,11 @@ public class UserPaymentOrderServiceImpl  implements UserPaymentOrderService {
     /**
      * 用户支付订单信息
      *
-     * @param transNo 交易流水号
      * @param merOrderNo 订单编号
      * @return UserPaymentOrder
      */
     @Override
-    public UserPaymentOrderWrapper.UserPaymentOrder getUserPaymentOrderByOrderNo(String transNo, String merOrderNo) {
+    public UserPaymentOrderWrapper.UserPaymentOrder getUserPaymentOrderByOrderNo(String merOrderNo) {
 
         // 查询订单信息
         UserOrder one = userOrderService.lambdaQuery()
@@ -68,7 +67,7 @@ public class UserPaymentOrderServiceImpl  implements UserPaymentOrderService {
         }
 
         // 查询订单支付信息
-        UserOrderPayment newestPayment = userOrderPaymentService.getNewestPayment(transNo, merOrderNo);
+        UserOrderPayment newestPayment = userOrderPaymentService.getNewestPayment(null, merOrderNo);
 
         return UserPaymentOrderWrapper.UserPaymentOrder.from(one, newestPayment);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantApplyRecordWrapper.java

@@ -171,6 +171,9 @@ public class TenantApplyRecordWrapper {
         @NotNull(message = "验证码不能为空")
         private String code;
 
+        @ApiModelProperty("群简介")
+        private String briefIntroduction;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

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

@@ -20,6 +20,7 @@
         , t.reason_ AS reason
         , t.update_time_ AS updateTime
         , t.create_time_ AS createTime
+        , t.brief_Introduction_ AS briefIntroduction
         </sql>
     <update id="updateStatusById">
         update  tenant_apply_record

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

@@ -42,4 +42,17 @@
         <include refid="baseColumns" />
         FROM user_order_refund_payment t
     </select>
+
+    <select id="getByTransNoOrOrderNo" resultMap="BaseResultMap">
+        select t.*
+        from user_order_refund_bill t
+        <where>
+            <if test="refundOrderNo != null and refundOrderNo != ''">
+                and t.bill_no_ = #{refundOrderNo}
+            </if>
+            <if test="transNo != null and transNo != ''">
+                and t.trans_no_ = #{transNo}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.teacher.controller;
 
+import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.template.R;
@@ -264,7 +265,7 @@ public class UserOrderController extends BaseController {
 
     @ApiOperation(value = "用户付款", notes = "用户付款")
     @PostMapping("/orderPay/v2")
-    public R<UserPaymentOrderWrapper.PaymentReq> executePaymentV2(@Validated @RequestBody UserPaymentOrderVo.PaymentReqConfig config) {
+    public R<UserPaymentOrderWrapper.PaymentReq> executePaymentV2(@Validated @RequestBody UserPaymentOrderVo.PaymentReqConfig config,HttpServletRequest request) {
         // 设置下单用户信息
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(sysUser)) {
@@ -275,6 +276,7 @@ public class UserOrderController extends BaseController {
         // 用户下单请求
         UserPaymentOrderWrapper.PaymentOrderReqConfig reqConfig = UserPaymentOrderWrapper.PaymentOrderReqConfig.from(config.jsonString());
 
+        reqConfig.setIp(ServletUtil.getClientIP(request));
         // 创建用户支付数据
         UserPaymentOrderWrapper.PaymentReq paymentConfig = userPaymentCoreService.executePayment(JwtUserInfo.builder()
                 .userId(sysUser.getId().toString()).clientType(ClientEnum.TEACHER.getCode()).build(), reqConfig);

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/UserOrderController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.tenant.controller;
 
+import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.microsvc.toolkit.common.response.template.R;
@@ -31,6 +32,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
 
 import static com.yonge.cooleshow.common.entity.HttpResponseResult.failed;
@@ -84,7 +86,7 @@ public class UserOrderController {
 
     @ApiOperation(value = "用户付款", notes = "用户付款")
     @PostMapping("/orderPay/v2")
-    public R<UserPaymentOrderWrapper.PaymentReq> executePayment(@Validated @RequestBody UserPaymentOrderVo.PaymentReqConfig config) {
+    public R<UserPaymentOrderWrapper.PaymentReq> executePayment(@Validated @RequestBody UserPaymentOrderVo.PaymentReqConfig config, HttpServletRequest request) {
         // 设置下单用户信息
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (Objects.isNull(sysUser)) {
@@ -95,6 +97,7 @@ public class UserOrderController {
         // 用户下单请求
         UserPaymentOrderWrapper.PaymentOrderReqConfig reqConfig = UserPaymentOrderWrapper.PaymentOrderReqConfig.from(config.jsonString());
 
+        reqConfig.setIp(ServletUtil.getClientIP(request));
         // 创建用户支付数据
         UserPaymentOrderWrapper.PaymentReq paymentConfig = userPaymentCoreService.executePayment(JwtUserInfo.builder()
                 .userId(sysUser.getId().toString()).clientType(ClientEnum.TENANT.getCode()).build(), reqConfig);

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenStudentController.java

@@ -5,6 +5,8 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.Student;
 import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
+import com.yonge.cooleshow.biz.dal.service.SmsCodeService;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
 import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
@@ -14,6 +16,7 @@ import com.yonge.cooleshow.tenant.vo.StudentVo;
 import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,9 +39,20 @@ public class OpenStudentController extends BaseController {
     @Resource
     private SysUserFeignService sysUserFeignService;
 
+    @Autowired
+    private SmsCodeService smsCodeService;
+
     @PostMapping("/save")
     @ApiOperation(value = "新增/修改", notes = "传入Student,换绑时按照返回错误码5004判断，是否需要换绑，updateTenant=true表示换绑")
     public HttpResponseResult<Boolean> save(@Validated @RequestBody StudentVo.Student student) {
+        String code = student.getCode();
+        if (StringUtils.isEmpty(code)) {
+            throw new BizException("验证码不能为空");
+        }
+        if (!smsCodeService.verifyValidCode(student.getPhone(), code,
+                MessageTypeEnum.SMS_VERIFY_CODE_REGISTER.getCode())) {
+            throw new BizException("验证码错误");
+        }
         Long tenantId = student.getTenantId();
         if (tenantId == null) {
             throw new BizException("未指定机构");
@@ -64,7 +78,8 @@ public class OpenStudentController extends BaseController {
             if (one != null) {
                 if (one.getTenantId().equals(-1L)) {
                     throw new BizException("该手机号已经注册为平台学生");
-                } else if (!one.getTenantId().equals(tenantId) && !student.getUpdateTenant()) {
+                } else if (!one.getTenantId().equals(tenantId) && (student.getUpdateTenant() == null ||
+                        !student.getUpdateTenant())) {
                     throw new BizException(5004, "该手机号已经注册为其他平台学生");
                 }
             }

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenSubjectController.java

@@ -0,0 +1,39 @@
+package com.yonge.cooleshow.tenant.controller.open;
+
+import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
+import com.yonge.cooleshow.biz.dal.service.SubjectService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.page.PageInfo;
+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.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("/open/subject")
+@Api(tags = "声部服务")
+@RestController
+public class OpenSubjectController extends BaseController {
+
+	@Autowired
+	private SubjectService subjectService;
+
+	@ApiOperation(value = "根据声部编号查询声部")
+	@GetMapping("/get/{id}")
+	public Object get(@ApiParam(value = "声部编号", required = true) @PathVariable("id") Long id) {
+		return succeed(subjectService.get(id));
+	}
+
+	@ApiOperation(value = "分页查询声部树状列表")
+	@PostMapping("/queryPageTree")
+	public HttpResponseResult<PageInfo<Subject>> queryPageTree(@RequestBody SubjectQueryInfo queryInfo) {
+		return succeed(subjectService.queryPageTree(queryInfo));
+	}
+}

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenSysAreaController.java

@@ -1,4 +1,4 @@
-package com.yonge.cooleshow.tenant.controller;
+package com.yonge.cooleshow.tenant.controller.open;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/vo/StudentVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import java.time.LocalDate;
 
 @ApiModel("学生入参模型")
@@ -13,7 +14,7 @@ public class StudentVo {
 
     @Data
     @ApiModel("添加/修改学生")
-    public static class Student{
+    public static class Student {
 
         @ApiModelProperty("id")
         private Long id;
@@ -33,7 +34,7 @@ public class StudentVo {
         private LocalDate birthdate;
 
         @ApiModelProperty("手机号码")
-        @NotNull
+        @Pattern(regexp = "^1\\d{10}$", message = "请输入正确的手机号码")
         private String phone;
 
         @ApiModelProperty("头像")
@@ -44,5 +45,8 @@ public class StudentVo {
 
         @ApiModelProperty("是否换绑机构,开放接口使用参数")
         private Boolean updateTenant;
+
+        @ApiModelProperty("短信验证码")
+        private String code;
     }
 }