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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/SysUserMapper.java

@@ -50,4 +50,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return List<CustomerService.MessageReceives>
      */
     List<CustomerService.MessageReceives> selectMessageReceives(@Param("param") CustomerService.NotifyMessage message);
+
+    com.yonge.cooleshow.auth.api.entity.SysUser findUserByPhone(@Param("phone") String phone);
 }

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

@@ -28,4 +28,6 @@ public interface SysUserService{
     IdcardInfoExtractor updateUserCard(RealnameAuthReq realNameAuthDto, SysUser sysUser, ClientEnum client);
 
     Map<Long,com.yonge.cooleshow.biz.dal.entity.SysUser> getMapByIds(List<Long> userIds);
+
+    SysUser findUserByPhone(String phone);
 }

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

@@ -123,4 +123,10 @@ public class SysUserServiceImpl implements SysUserService {
         }
         return sysUsers.stream().collect(HashMap::new, (m, v) -> m.put(v.getId(), v), HashMap::putAll);
     }
+
+    @Override
+    public SysUser findUserByPhone(String phone) {
+
+        return sysUserMapper.findUserByPhone(phone);
+    }
 }

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

@@ -114,6 +114,11 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         musicSheetQuery.setMusicTagId(query.getMusicTagId());
         musicSheetQuery.setSubjectId(query.getSubjectId());
         musicSheetQuery.setKeyword(query.getKeyword());
+        //把集合转为字符串
+        String collect1 = musicSheetIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(", "));
+        musicSheetQuery.setCollect(collect1);
 
         List<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> musicSheets = tenantAlbumMusicMapper.selectPage(page, musicSheetQuery);
 

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

@@ -60,7 +60,7 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
     private SysConfigService sysConfigService;
 
     @Autowired
-    private SysUserMapper sysUserMapper;
+    private SysUserMapper  sysUserMapper;
 
     /**
      * 查询详情
@@ -126,7 +126,7 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
         // 根据手机号 判断是否已经有机构账户
         TenantStaff tenantStaff = tenantStaffService.getByPhone(tenantApply.getPhone());
         if (tenantStaff != null) {
-            throw new BizException("该手机号已经有机构账户");
+            throw new BizException("该手机号已经有机构账号");
         }
 
         QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();

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

@@ -228,13 +228,20 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     public UserOrderVo detail(Long id) {
         UserOrderVo userOrderVo = baseMapper.detailById(id);
         if (null != userOrderVo) {
-            userOrderVo.setOrderDetailList(orderDetailService.getOrderDetilListByOrderNo(userOrderVo.getOrderNo()));
+            List<UserOrderDetailVo> orderDetilListByOrderNo = orderDetailService.getOrderDetilListByOrderNo(userOrderVo.getOrderNo());
+            userOrderVo.setOrderDetailList(orderDetilListByOrderNo);
             if (userOrderVo.getTenantId() != null) {
                 TenantInfo tenantInfo = tenantInfoService.getById(userOrderVo.getTenantId());
                 if (tenantInfo != null) {
                     userOrderVo.setTenantName(tenantInfo.getName());
                 }
             }
+            for (UserOrderDetailVo userOrderDetailVo : orderDetilListByOrderNo) {
+                if (userOrderDetailVo.getGoodType().equals(GoodTypeEnum.TENANT_ALBUM)) {
+                    TenantAlbum tenantAlbum = tenantAlbumService.getById(userOrderDetailVo.getBizId());
+                    userOrderDetailVo.setGoodUrl(tenantAlbum.getCoverImg());
+                }
+            }
         }
         return userOrderVo;
     }

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

@@ -523,6 +523,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             item.setActivityId(orderReq.getActivityId());
             item.setUserId(orderReq.getUserId());
             item.setPaymentClient(orderReq.getPaymentClient());
+            item.setRecomUserId(orderReq.getRecomUserId());
 
 
             BigDecimal couponAmount = BigDecimal.ZERO;
@@ -531,7 +532,6 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
                 // 填充商品基础信息，校验参数合法以性
                 orderGoodsCreate.get(item.getGoodType()).accept(item);
                 UserOrderDetail userOrderDetail = item.getUserOrderDetail();
-                userOrderDetail.setMerchId(orderReq.getRecomUserId());
                 orderDetails.add(userOrderDetail);
                 // 根据优惠券计算实际优惠金额
                 // 计算优惠券金额

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

@@ -163,8 +163,8 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty("机构id")
         private Long tenantId;
 
-
-
+        @ApiModelProperty(name = "集合")
+        private String collect;
 
 
         public String getKeyword() {
@@ -256,6 +256,9 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty("关键词")
         private String keyword;
 
+        @ApiModelProperty(name = "集合")
+        private String collect;
+
 
 
 

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

@@ -369,7 +369,7 @@
 		group by smcr.user_id_, DATE_FORMAT(create_time_, '%Y-%m-%d')) mprs ON mprs.user_id_ = st.user_id_
 		left join sys_user su ON st.user_id_ = su.id_
 		left join subject sb ON sb.id_ = st.subject_id_
-		where st.membership_end_time_ >= NOW() AND mprs.user_id_ = st.user_id_
+		where mprs.user_id_ = st.user_id_
 		<if test="search != null and search != ''">
 			AND su.username_ LIKE CONCAT('%',#{keyword},'%')
 		</if>
@@ -384,32 +384,34 @@
 		from student st
 		left join sys_user su ON st.user_id_ = su.id_
 		LEFT JOIN sys_music_compare_record smcr ON smcr.user_id_ = st.user_id_
-		where st.membership_end_time_ >= NOW()
-		<if test="tenantId != null">
-			AND smcr.tenant_id_ = #{tenantId}
-		</if>
-		<if test="startTime != null and startTime != ''">
-			AND smcr.create_time_ BETWEEN #{startTime} AND #{endTime}
-		</if>
-		<if test="search != null and search != ''">
-			AND su.username_ LIKE CONCAT('%',#{keyword},'%')
-		</if>
+		<where>
+			<if test="tenantId != null">
+				AND smcr.tenant_id_ = #{tenantId}
+			</if>
+			<if test="startTime != null and startTime != ''">
+				AND smcr.create_time_ BETWEEN #{startTime} AND #{endTime}
+			</if>
+			<if test="search != null and search != ''">
+				AND su.username_ LIKE CONCAT('%',#{keyword},'%')
+			</if>
+		</where>
 	</select>
 	<select id="wechatCompareRecordSum"
 			resultType="com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo$WechatCompareRecordSumDto">
 		select COUNT(st.user_id_) studentNum,COUNT(DISTINCT DATE_FORMAT(smcr.create_time_,'%Y-%m-%d')) trainDays,SUM(smcr.play_time_) trainTimes
 		from student st
 		LEFT JOIN sys_music_compare_record smcr ON smcr.user_id_ = st.user_id_
-		where st.membership_end_time_ >= NOW()
-		<if test="queryInfo.startTime != null and queryInfo.startTime != ''">
-			AND smcr.create_time_ BETWEEN #{queryInfo.startTime} AND #{queryInfo.endTime}
-		</if>
-		<if test="queryInfo.tenantId != null">
-			AND smcr.tenant_id_ = #{queryInfo.tenantId}
-		</if>
-		<if test="queryInfo.tenantId != null">
-			AND st.tenant_id_ = #{queryInfo.tenantId}
-		</if>
+		<where>
+			<if test="queryInfo.startTime != null and queryInfo.startTime != ''">
+				AND smcr.create_time_ BETWEEN #{queryInfo.startTime} AND #{queryInfo.endTime}
+			</if>
+			<if test="queryInfo.tenantId != null">
+				AND smcr.tenant_id_ = #{queryInfo.tenantId}
+			</if>
+			<if test="queryInfo.tenantId != null">
+				AND st.tenant_id_ = #{queryInfo.tenantId}
+			</if>
+		</where>
 	</select>
     <select id="queryStudentTrain"
             resultType="com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo$StudentMusicCompareRecord">

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

@@ -107,5 +107,9 @@
         </where>
         LIMIT 1500
     </select>
+
+    <select id="findUserByPhone" resultType="com.yonge.cooleshow.auth.api.entity.SysUser">
+        SELECT * FROM sys_user WHERE phone_ = #{phone} AND del_flag_ = 0
+    </select>
     <!--客服消息接收者-->
 </mapper>

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

@@ -50,6 +50,9 @@
                 and m.music_sheet_name_ LIKE CONCAT('%',#{param.keyword},'%')
             </if>
         </where>
+        <if test="param.musicSheetIds != null and param.musicSheetIds.size != 0">
+            order by field(m.id_,${param.collect})
+        </if>
 	</select>
     <select id="selectMusicSheetIds" resultType="java.lang.Long">
         select