Merge branch 'quanku_v2.3' into quanku_v2.4

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

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysDistributionOrderServiceImpl.java

@@ -88,7 +88,8 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                 }
             }
             if (dto.getType() == null) {
-                dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.AUCTION.getCode()));
+                dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.AUCTION.getCode()
+                        , DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode()));
             }
             List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
             PageInfo pageInfo = new PageInfo<>(distributionOrderList);

ch-core/src/main/java/com/wwdz/ch/core/consts/CommConsts.java

@@ -40,6 +40,9 @@ public interface CommConsts {
 
 	public static final Long SYSTEM_ACCOUNT = 8888888888L;
 
+
+	public static final String DEFAULT_SHARE_ID= "DA" + SYSTEM_ACCOUNT;
+
 	/**
 	 * 默认展示的卖家，逍遥的id
 	 */

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

@@ -1224,7 +1224,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             DistributionOrder distributionOrder = new DistributionOrder();
             distributionOrder.setItemId(supplierItem.getId());
             distributionOrder.setItemNum(1);
-            distributionOrder.setShareRecordId("DA" + CommConsts.SYSTEM_ACCOUNT);
+            distributionOrder.setShareRecordId(CommConsts.DEFAULT_SHARE_ID);
             distributionOrder.setDistributionOrderId(distributionOrderId);
             distributionOrder.setPrepayId(prepayId);
             distributionOrder.setBuyerId(dto.getBuyerId());

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

@@ -48,7 +48,7 @@ public class LogisticsServiceImpl implements LogisticsService {
                 }
             }
         } catch (Exception e) {
-            logger.error("修改开关状态 error : {}", e);
+            logger.error("查询物流轨迹 error : {}", e);
         }
         return Result.failed();
     }

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

@@ -204,7 +204,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             }
             SupplierItem supplierItem = supplierItemDao.findById(itemId);
             SupplierItemVo supplierItemVo = new SupplierItemVo();
-            if (StringUtils.hasLength(shareRecordId)) {
+            if (StringUtils.hasLength(shareRecordId) && !shareRecordId.equals(CommConsts.DEFAULT_SHARE_ID)) {
                 if (distributorShareRecord.getDistributorId().longValue() != dto.getUserId().longValue()) {
                     //做浏览记录
                     boolean flag = userRecentBrowseDao.isExisted(dto.getUserId(), distributorShareRecord.getDistributorId());