chenjiahe
2024-01-29 3d9dc2a4de68ad623b5bb727403bb6667288158e
再生俱乐部提交
3个文件已修改
34 ■■■■ 已修改文件
phi_platform_common/src/main/java/com/hx/phip/service/tool/club/UserCluebMemberServiceTool.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/resources/mapper/platform/UserClubMemberMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/common/TestController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/java/com/hx/phip/service/tool/club/UserCluebMemberServiceTool.java
@@ -303,7 +303,9 @@
        }
        //当前订单的,总疗程数,所有的项目疗程数总和
        System.out.println("chekCureVo:");
        ChekCureVo chekCureVo = orderHandle(ordersTotal,skuNoSet,commonService);
        System.out.println("chekCureVo:"+JSON.toJSONString(chekCureVo));
        if(!chekCureVo.isCureProject()){
            return RESULT_NOT_JOIN;
        }
phi_platform_common/src/main/resources/mapper/platform/UserClubMemberMapper.xml
@@ -8,7 +8,7 @@
    <!-- 整个实体类修改,表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,type = #{type},status = #{status},durationType = #{durationType},startTime = #{startTime},endTime = #{endTime},sourceType = #{sourceType},sourceId = #{sourceId},sourceOtherId = #{sourceOtherId},discardSource = #{discardSource},discardSourceId = #{discardSourceId},discardReason = #{discardReason},userId = #{userId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
            ,type = #{type},status = #{status},durationType = #{durationType},startTime = #{startTime},endTime = #{endTime},sourceType = #{sourceType},sourceId = #{sourceId},sourceOtherId = #{sourceOtherId},discardSource = #{discardSource},discardId = #{discardId},discardOtherId = #{discardOtherId},discardReason = #{discardReason},discardTime = #{discardTime},userId = #{userId},isDel = #{isDel},createTime = #{createTime},editTime = #{editTime}
        </trim>
    </sql>
     
@@ -19,11 +19,11 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into user_club_member (id,type,status,durationType,startTime,endTime,sourceType,sourceId,sourceOtherId,discardSource,discardSourceId,discardReason,userId,isDel,createTime,editTime)  values (#{id},#{type},#{status},#{durationType},#{startTime},#{endTime},#{sourceType},#{sourceId},#{sourceOtherId},#{discardSource},#{discardSourceId},#{discardReason},#{userId},#{isDel},#{createTime},#{editTime})
        insert into user_club_member (id,type,status,durationType,startTime,endTime,sourceType,sourceId,sourceOtherId,discardSource,discardId,discardOtherId,discardReason,discardTime,userId,isDel,createTime,editTime)  values (#{id},#{type},#{status},#{durationType},#{startTime},#{endTime},#{sourceType},#{sourceId},#{sourceOtherId},#{discardSource},#{discardId},#{discardOtherId},#{discardReason},#{discardTime},#{userId},#{isDel},#{createTime},#{editTime})
    </insert>
    <insert id="insertById" parameterType="com.hx.phiappt.model.user.club.UserClubMember">
        insert into user_club_member (id,type,status,durationType,startTime,endTime,sourceType,sourceId,sourceOtherId,discardSource,discardSourceId,discardReason,userId,isDel,createTime,editTime)  values (#{id},#{type},#{status},#{durationType},#{startTime},#{endTime},#{sourceType},#{sourceId},#{sourceOtherId},#{discardSource},#{discardSourceId},#{discardReason},#{userId},#{isDel},#{createTime},#{editTime})
        insert into user_club_member (id,type,status,durationType,startTime,endTime,sourceType,sourceId,sourceOtherId,discardSource,discardId,discardOtherId,discardReason,discardTime,userId,isDel,createTime,editTime)  values (#{id},#{type},#{status},#{durationType},#{startTime},#{endTime},#{sourceType},#{sourceId},#{sourceOtherId},#{discardSource},#{discardId},#{discardOtherId},#{discardReason},#{discardTime},#{userId},#{isDel},#{createTime},#{editTime})
    </insert>
    <select id="selectList" resultType="com.hx.phiappt.model.user.club.UserClubMember" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -55,14 +55,14 @@
    <select id="selectOneByKey" resultType="com.hx.phiappt.model.user.club.UserClubMember" parameterType="java.lang.Object" >
        select 
            id,type,status,durationType,startTime,endTime,sourceType,sourceId,sourceOtherId,discardSource,discardSourceId,discardReason,userId,isDel,createTime,editTime
            id,type,status,durationType,startTime,endTime,sourceType,sourceId,sourceOtherId,discardSource,discardId,discardOtherId,discardReason,discardTime,userId,isDel,createTime,editTime
        from user_club_member
        WHERE id = #{value}
    </select>
    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.user.club.UserClubMember" parameterType="java.lang.Object" >
        select 
            id,type,status,durationType,startTime,endTime,sourceType,sourceId,sourceOtherId,discardSource,discardSourceId,discardReason,userId,isDel,createTime,editTime
            id,type,status,durationType,startTime,endTime,sourceType,sourceId,sourceOtherId,discardSource,discardId,discardOtherId,discardReason,discardTime,userId,isDel,createTime,editTime
        from user_club_member
        WHERE id = #{value}
    </select>
phi_platform_user/src/main/java/com/hx/phip/common/TestController.java
@@ -39,15 +39,33 @@
    private UserCluebMemberServiceTool userCluebMemberServiceTool;
    /**
     *俱乐部会员测试
     *俱乐部会员测试-校验生成
     */
    @RequestMapping(value = "/club/member",method = RequestMethod.POST)
    public PlatformResult typeList(@RequestBody OrderPayVo orderPayVo) {
    public PlatformResult clubMemberCreate(@RequestBody OrderPayVo orderPayVo) {
        userCluebMemberServiceTool.orderChekMember(orderPayVo.getOrderId(), null,null,MarketSystem.TYPE_REGENERATION);
        return PlatformResult.success();
    }
    /**
     *俱乐部会员测试-退款
     */
    @RequestMapping(value = "/club/member/refund",method = RequestMethod.POST)
    public PlatformResult clubMemberRefund(@RequestBody OrderPayVo orderPayVo) {
        userCluebMemberServiceTool.refundChekMember(orderPayVo.getOrderId(), null,null,MarketSystem.TYPE_REGENERATION);
        return PlatformResult.success();
    }
    /**
     *俱乐部会员测试-作废
     */
    @RequestMapping(value = "/club/member/refund/cancel",method = RequestMethod.POST)
    public PlatformResult clubMemberRefundCancel(@RequestBody OrderPayVo orderPayVo) {
        userCluebMemberServiceTool.refundCancelChekMember(orderPayVo.getOrderId(), null,null,MarketSystem.TYPE_REGENERATION);
        return PlatformResult.success();
    }
    /**
     *获取员工的
     */
    @RequestMapping(value = "/roleData",method = RequestMethod.POST)