3.2版本

ch-admin-api/src/main/java/com/wwdz/ch/admin/job/SynItemToEsJob.java

@@ -68,9 +68,9 @@ public class SynItemToEsJob {
     SynDataRecordDao synDataRecordDao;
 
     /**
-     * 隔2分钟运行一次
+     * 隔1分钟运行一次
      */
-  //  @Scheduled(fixedDelay = 1000 * 60 * 2)
+ //   @Scheduled(fixedDelay = 1000 * 60 * 1)
     public void execute() {
         RLock lock = redissonClient.getLock(QUANKU_SYN_TO_ES_TASK_KEY);
         if (!lock.tryLock()) {
@@ -155,7 +155,6 @@ public class SynItemToEsJob {
             supplierItemRequestDto.setLimit(100);
             List<SupplierItem> list = supplierItemDao.findListByPage(supplierItemRequestDto);
             itemEsDao.create(list);
-            logger.info(">>>>>>>>>>>>>>>>>11111111 <<<<<<<<<<<<<<<<<");
             PageInfo<SupplierItem> pageInfo = new PageInfo<>(list);
             int totalPageNum = pageInfo.getPages();
             logger.info("total page : {}, total : {}", totalPageNum, pageInfo.getTotal());

ch-dao/src/main/java/com/wwdz/ch/db/es/ItemEsDao.java

@@ -315,7 +315,7 @@ public class ItemEsDao {
                     .build();
             IndexResponse indexResponse = elasticsearchClient.index(indexRequest);
             logger.info("indexResponse ={}", indexResponse);
-            if (indexResponse.shards().successful().intValue() == 1 ) {
+            if (indexResponse.shards().failed().intValue() == 0 ) {
                 logger.info("ES upsert 数据成功 : {} ", supplierItem.getId());
             } else {
                 logger.error("ES upsert 数据失败 : {} ", supplierItem.getId());

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="distribution_order" 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/test/java/com/wwdz/ch/wx/api/WxPayServiceTest.java

@@ -89,12 +89,12 @@ public class WxPayServiceTest {
 
     @Test
     public void refund() {
-        List<String> list = Arrays.asList("DA2408162000075498680");
+        List<String> list = Arrays.asList("DA2410142000276534622");
         list.forEach(orderId ->{
             DistributionOrderRequestDto dto = new DistributionOrderRequestDto();
             dto.setDistributionOrderId(orderId);
-            dto.setAmount("430");
-            dto.setRefundPrice("430");
+            dto.setAmount("12");
+            dto.setRefundPrice("12");
             Result result = wxPayServiceApi.refund(dto);
             logger.info("申请微信支付退款:{}", result);
         });