关注记录日志

ch-core/src/main/java/com/wwdz/ch/core/api/OfficialAccountApi.java

@@ -38,7 +38,6 @@ public class OfficialAccountApi {
     private final static String GET_JSAPI_TICKET = "https://api.weixin.qq.com/cgi-bin/ticket/getticket";
 
 
-
     /**
      * 测试环境和正式环境的url不同，相互隔离不会冲突
      */

ch-dao/src/main/resources/generatorConfig_new.xml

@@ -63,16 +63,16 @@
 
 
         <!--生成Model类存放位置-->
-        <javaModelGenerator targetPackage="com.wwdz.ch.db.domain.distribution" targetProject="ch-dao/src/main/java">
+        <javaModelGenerator targetPackage="com.wwdz.ch.db.domain" targetProject="ch-dao/src/main/java">
             <property name="enableSubPackages" value="true"/>
             <property name="trimStrings" value="true"/>
         </javaModelGenerator>
 
-        <sqlMapGenerator targetPackage="com.wwdz.ch.db.mapper.distribution" targetProject="ch-dao/src/main/resources"/>
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.wwdz.ch.db.mapper.distribution"
+        <sqlMapGenerator targetPackage="com.wwdz.ch.db.mapper" targetProject="ch-dao/src/main/resources"/>
+        <javaClientGenerator type="XMLMAPPER" targetPackage="com.wwdz.ch.db.mapper"
                              targetProject="ch-dao/src/main/java"/>
 
-        <table tableName="user_bill" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
+        <table tableName="collector_white_list" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
             <generatedKey column="id" sqlStatement="Mysql" identity="true" />
         </table>
 

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionItemsRelationServiceImpl.java

@@ -120,7 +120,7 @@ public class CollectionItemsRelationServiceImpl implements CollectionItemsRelati
                         followFansRecordRequestDto.setFansId(dto.getUserId());
                         followFansRecordRequestDto.setIntroducerId(CommConsts.SYSTEM_ACCOUNT);
                         followFansRecordService.follow(followFansRecordRequestDto);
-                        logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为 {}", dto.getUserId(), searchUserId, dto.getUserId());
+                        logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为 {}", dto.getUserId(), searchUserId, CommConsts.SYSTEM_ACCOUNT);
                     }
                 } else {
                     return Result.failed("targetUserId不能为空");

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -536,7 +536,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             long introducerId = CommConsts.SYSTEM_ACCOUNT;
             if (StringUtils.isEmpty(shareRecordId) && dto.getId() == null) {
                 return Result.failed("商品信息为空");
-            } else if (StringUtils.hasLength(shareRecordId) && ! shareRecordId.equals(CommConsts.DEFAULT_SHARE_ID)) {
+            } else if (StringUtils.hasLength(shareRecordId) && !shareRecordId.equals(CommConsts.DEFAULT_SHARE_ID)) {
                 collectionShareRecord = collectionShareRecordDao.findById(dto.getShareRecordId());
                 introducerId = collectionShareRecord.getSharerId();
                 itemId = collectionShareRecord.getShareTargetId();
@@ -549,9 +549,9 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                     followFansRecordRequestDto.setIntroducerId(introducerId);
                     Result followResult = followFansRecordService.follow(followFansRecordRequestDto);
                     if (followResult.getSuccess()) {
-                        logger.info("通过藏品详情分享点击，用户id:{} 关注了 用户id为 {}， 介绍人为", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
+                        logger.info("查询拍卖商品详情api-通过藏品详情分享点击，用户id:{} 关注了 用户id为 {}， 介绍人为{}", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
                     } else {
-                        logger.info("通过藏品详情分享点击关注用户返回信息 : {}" + followResult.getErrmsg());
+                        logger.info("查询拍卖商品详情api-通过藏品详情分享点击关注用户返回信息 : {}" + followResult.getErrmsg());
                     }
                 }
             } else {
@@ -845,7 +845,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                     followFansRecordRequestDto.setFansId(dto.getUserId());
                     followFansRecordRequestDto.setIntroducerId(collectionShareRecord.getSharerId());
                     followFansRecordService.follow(followFansRecordRequestDto);
-                    logger.info("通过藏品详情分享点击，用户id:{} 关注了 用户id为 {}， 介绍人为", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
+                    logger.info("查询藏家商品详情api-通过藏品详情分享点击，用户id:{} 关注了 用户id为 {}， 介绍人为{}", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
                 }
             }
             supplierItemVo.setIsCollected(true);

ch-wx-api/src/test/java/com/wwdz/ch/wx/api/WxPayServiceTest.java

@@ -89,7 +89,7 @@ public class WxPayServiceTest {
 
     @Test
     public void refund() {
-        List<String> list = Arrays.asList("DA2407161530475539946", "DA2407161638434429860");
+        List<String> list = Arrays.asList("DA2407171559445071432");
         list.forEach(orderId ->{
             DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
             dto.setDistributionOrderId(orderId);