修改多次创建私人聊天时功能

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/ChatSessionMapper.java

@@ -78,9 +78,8 @@ public interface ChatSessionMapper extends BaseMapper<ChatSessionEntity> {
 
     int batchUpdateEntrance(@Param("sessionId") String sessionId, @Param("entrance") Integer entrance);
 
-    @Select("select sessionid from chat_session where (user_id = #{userId}  and create_user_id  = #{createUserId}) or (user_id = #{createUserId}  and create_user_id  = #{userId})   and data_table = #{dataTable}")
-    String findOneByUserIdAndCreateUserIdAndDateTable(@Param("userId") String userId,
-        @Param("createUserId") String createUserId, @Param("dataTable") Integer dataTable);
+//    @Select("select sessionid from chat_session where (user_id = #{userId}  and create_user_id  = #{createUserId}) or (user_id = #{createUserId}  and create_user_id  = #{userId})   and data_table = #{dataTable}")
+    String findOneByUserIdAndCreateUserIdAndDateTable(@Param("userId") String userId, @Param("createUserId") String createUserId, @Param("dataTable") Integer dataTable);
 
 
     List<ChatSessionEntity> findAllSession();

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/ChatSessionMapper.xml

@@ -355,4 +355,14 @@
     left join lift_case cas on cas.session_id = sessio.sessionid
     left join user_info usr on sessio.user_id = usr.user_id
   </select>
+
+
+  <select id="findOneByUserIdAndCreateUserIdAndDateTable" resultType="java.lang.String">
+    select temp1.sessionid from (
+    select * from chat_session where FIND_IN_SET(#{userId},user_id) and data_table=#{dataTable}
+    )temp1
+    inner join (
+    select * from chat_session where FIND_IN_SET(#{createUserId},user_id) and data_table=#{dataTable}
+    )temp2 on temp1.sessionid=temp2.sessionid
+  </select>
 </mapper>

lift-ud-service/src/main/java/cn/com/ty/lift/ud/payment/service/impl/ApplyInvoiceServiceImpl.java

@@ -1,8 +1,11 @@
 package cn.com.ty.lift.ud.payment.service.impl;
 
 import java.math.BigDecimal;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 
+import com.lowagie.text.pdf.AcroFields;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,17 +69,17 @@ public class ApplyInvoiceServiceImpl extends ServiceImpl<ApplyInvoiceMapper, App
         applyInvoiceMapper.insert(applyInvoiceEntity);
         OtherSettingEntity latestVersion = otherSettingMapper.getLatestVersion();
         for (ApplyInvoiceItemEntity item : applyInvoiceEntity.getInvoiceItem()) {
-            LiftCaseEntity selectById = caseMapper.selectById(item.getId());
-            selectById.setIsInvoice(1);
-            caseMapper.updateById(selectById);
-            item.setDataId(selectById.getId());
+            LiftCaseEntity liftCase = caseMapper.selectById(item.getId());
+            liftCase.setIsInvoice(1);
+            caseMapper.updateById(liftCase);
+            item.setDataId(liftCase.getId());
             item.setInvoiceId(applyInvoiceEntity.getId());
             item.setDw("次");
             item.setXmmc("咨询服务");
             item.setGgxh("无");
             item.setFphxz(1);
-            item.setXmdj(selectById.getPayCost());
-            item.setXmze(selectById.getPayCost());
+            item.setXmdj(liftCase.getPayCost());
+            item.setXmze(liftCase.getPayCost());
             item.setXmsl(1);
             item.setSl(latestVersion.getDefaultTax());
             item.setSe((new BigDecimal(item.getSl())).multiply(item.getXmze()).divide(new BigDecimal("100")));
@@ -96,6 +99,19 @@ public class ApplyInvoiceServiceImpl extends ServiceImpl<ApplyInvoiceMapper, App
         } else {
             // 修改状态为 驳回，并加上驳回理由
             applyInvoiceMapper.updateInfoById(neDto.getId(), neDto.getReason());
+
+            // 修改订单状态，让他可以重新提交申请
+            Optional<ApplyInvoiceEntity> invoiceOptional = Optional.ofNullable(super.getById(neDto.getId()));
+            invoiceOptional.ifPresent(applyInvoiceEntity -> {
+                ApplyInvoiceEntity invoiceEntity = super.getById(applyInvoiceEntity.getId());
+                Iterator<ApplyInvoiceItemEntity> iterator = invoiceEntity.getInvoiceItem().iterator();
+                while (iterator.hasNext()){
+                    ApplyInvoiceItemEntity item = iterator.next();
+                    LiftCaseEntity liftCase = caseMapper.selectById(item.getId());
+                    liftCase.setIsInvoice(0);
+                    caseMapper.updateById(liftCase);
+                }
+            });
             // todo 发送消息给该用户
             return RestResponse.fail(null, "审批驳回");
         }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/mapper/UserInfoMapper.xml

@@ -252,7 +252,7 @@
 		left join user_bill bill on bill.flow_num=sv.order_serial_number and bill.user_id!=#{userId}
 		left join user_info info on info.user_id = bill.user_id
 		where sv.type = 4 and sv.user_id=#{userId}
-	) temp order by create_time;
+	) temp order by createTime;
 
 	</select>
 </mapper>

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/impl/UserInfoServiceImpl.java

@@ -562,37 +562,40 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
     @Override
     public RestResponse cancelVip(UserLevelDto userLevelDto) {
         if (null != userLevelDto.getUserId()) {
-            if (null == userLevelDto.getMaintenanceCompanyId()) {
+            UserLevelRuleEntity levelRule = iUserLevelRuleService.getByCode("PERSON");
+            cancel(userLevelDto.getUserId(), levelRule);
+            return RestResponse.success(null, "取消成功");
+            /*if (null == userLevelDto.getMaintenanceCompanyId()) {
                 // 个人vip用户，如果是专家，user_level_name 显示专家，user_level 保存 普通用户的角色ID ，变成个人普通用户
                 UserLevelRuleEntity person = iUserLevelRuleService.getByCode("PERSON");
                 cancel(userLevelDto, person);
                 return RestResponse.success(null, "取消成功");
             } else {
                 // 有企业的vip，如果是专家，user_level_name 显示专家，user_level 保存 普通用户的角色ID ，变成企业普通用户
-                UserLevelRuleEntity company = iUserLevelRuleService.getByCode("COMPANY");
+                UserLevelRuleEntity company = iUserLevelRuleService.getByCode("PERSON");
                 cancel(userLevelDto, company);
                 return RestResponse.success(null, "取消成功");
-            }
+            }*/
         } else {
             return RestResponse.fail("缺少用户ID或者app角色ID");
         }
     }
 
-    private void cancel(UserLevelDto userLevelDto, UserLevelRuleEntity entity) {
-        UserAccount userAccount = iUserAccountService.getOneById(userLevelDto.getUserId());
+    private void cancel(Long userId, UserLevelRuleEntity levelEntity) {
+        UserAccount userAccount = iUserAccountService.getOneById(userId);
         UserLevelRuleEntity expert = null;
         if (userAccount.getExpertFlag() == 1) {
             expert = iUserLevelRuleService.getByCode("EXPERT");
             // 专家
             if (null != expert) {
-                userInfoMapper.cancelVip(userLevelDto.getUserId(), entity.getId(), LocalDateTime.now(), expert.getName());
+                userInfoMapper.cancelVip(userId, levelEntity.getId(), LocalDateTime.now(), expert.getName());
             } else {
                 log.info("专家角色不存在");
             }
         } else {
             // 不是专家
-            if (null != entity) {
-                userInfoMapper.cancelVip(userLevelDto.getUserId(), entity.getId(), LocalDateTime.now(), entity.getName());
+            if (null != levelEntity) {
+                userInfoMapper.cancelVip(userId, levelEntity.getId(), LocalDateTime.now(), levelEntity.getName());
             } else {
                 log.info("普通角色不存在");
             }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userresume/mapper/entity/UserResume.java

@@ -51,7 +51,7 @@ public class UserResume extends BaseEntity {
 	 * 出生年月
 	 */
 	@ApiModelProperty("出生年月")
-	private String brithday;
+	private String birthday;
 
 	/**
 	 * 工龄