修改互要微信

src/main/java/org/rcisoft/business/memInfo/dao/MemInfoRepository.java

@@ -185,7 +185,7 @@ public interface MemInfoRepository extends CyBaseMapper<MemInfo> {
     /**
      * 修改索要微信任务
      */
-    int updateWeChatTask(MemUserTaskDTO memUserTaskDTO);
+    int updateWeChatTask(@Param("entity") MemUserTaskDTO memUserTaskDTO);
 
     /**
      * 查询互换微信任务记录

src/main/java/org/rcisoft/business/memInfo/service/impl/MemInfoServiceImpl.java

@@ -880,6 +880,8 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         DictData dictData2 = userLikeConfig.stream().filter(item -> item.getDictLabel().equals("accept_exchange_wechat")).findFirst().orElse(null);
         Integer requestGoldCoinCount = Integer.valueOf(dictData1.getDictValue());//发起请求需消耗的金币数
         Integer acceptGoldCoinCount = Integer.valueOf(dictData2.getDictValue());//接收需消耗的金币数
+//        Integer requestGoldCoinCount = Integer.valueOf('1');//发起请求需消耗的金币数
+//        Integer acceptGoldCoinCount = Integer.valueOf('1');//接收需消耗的金币数
         if (memUserTaskDTO.getType().equals("1")){
             //发起请求
             //扣除该用户的金币数量
@@ -931,16 +933,15 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
                         memInfoRepository.updateById(memInfo);
                         //修改微信任务
                         line = baseMapper.updateWeChatTask(memUserTaskDTO);
+                        lock.unlock();
                     }
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
+                    lock.unlock();
                     isGetLock = false;
                     throw new CyServiceException(1004,"服务器繁忙，请稍后再试");
-                } finally {
-                    lock.unlock();
-                    log.error("释放成功");
-                    return new CyPersistModel(line);
                 }
+                return new CyPersistModel(line);
             } else {
                 //拒绝
                 //修改微信任务

src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml

@@ -780,8 +780,8 @@
     <select id="selectWeChatTask" resultType="org.rcisoft.business.memInfo.entity.MemUserTaskDTO">
         select *
         from mem_user_task
-        where 1=1
-          and target_id = #{entity.targetId}
-          and create_by = #{entity.createBy}
+        WHERE
+            (create_by = #{entity.createBy} and target_id = #{entity.targetId})
+           OR (create_by = #{entity.targetId} and target_id = #{entity.createBy})
     </select>
 </mapper>