分销选品页查询

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

+package com.wwdz.ch.core.consts;
+
+public class DistributionEnum {
+
+    /**
+     * 分销订单状态
+     */
+    public enum  DistributionOrderStateEnum {
+        PRE_PAY(1, "待付款"),
+        PRE_SEND(10, "待发货"),
+        PRE_SIGNED(20, "待收货"),
+        FINISH(100, "已完成"),
+        CANCEL(101, "已取消"),
+
+        ;
+
+        private int code;
+        private String des;
+
+        DistributionOrderStateEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+
+            for (DistributionEnum.DistributionOrderStateEnum distributionOrderStateEnum : DistributionEnum.DistributionOrderStateEnum.values()) {
+                if (code == distributionOrderStateEnum.getCode()) {
+                    return distributionOrderStateEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+
+
+}

ch-core/src/main/java/com/wwdz/ch/core/util/PriceUtil.java

@@ -18,8 +18,20 @@ public class PriceUtil {
         return df.format(bigDecimal);
     }
 
+    public static Long convertPriceFromStr(String price){
+        BigDecimal bigDecimal = new BigDecimal(price);
+        bigDecimal = bigDecimal.multiply(new BigDecimal(100));
+        return  bigDecimal.longValue();
+    }
+
+
+    public static Long convertPriceUnit(Long price){
+        BigDecimal bigDecimal = new BigDecimal(price);
+        bigDecimal = bigDecimal.multiply(new BigDecimal(100));
+        return  bigDecimal.longValue();
+    }
 
     public static void main(String[] args) {
-        System.out.println(convertPriceByTwo(18900));
+        System.out.println(convertPriceFromStr("19.9"));
     }
 }

ch-dao/pom.xml

@@ -12,6 +12,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <user-api.version>1.9.33</user-api.version>
+    <module-shop.version>1.18.20</module-shop.version>
     <content-center-api.version>3.0.41</content-center-api.version>
   </properties>
   
@@ -223,6 +224,34 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>com.wwdz.mall</groupId>
+            <artifactId>shop-api</artifactId>
+            <version>${module-shop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.wwdz.mall</groupId>
+                    <artifactId>trade-center-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.wwdz.mall</groupId>
+                    <artifactId>pay-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.wwdz.mall</groupId>
+                    <artifactId>activity-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.wwdz.mall</groupId>
+                    <artifactId>item-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+       <!-- <dependency>
+            <groupId>com.alibaba.spring</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>1.0.11</version>
+        </dependency>-->
 
         <dependency>
             <groupId>com.wwdz.mall</groupId>
@@ -234,6 +263,12 @@
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
             <version>2.7.6.1.0-ext</version>
+           <!-- <exclusions>
+                <exclusion>
+                    <artifactId>spring-context-support</artifactId>
+                    <groupId>com.alibaba.spring</groupId>
+                </exclusion>
+            </exclusions>-->
         </dependency>
         <dependency>
             <groupId>org.apache.curator</groupId>

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/DistributionOrderDao.java

+package com.wwdz.ch.db.dao.distribution;
+
+import com.wwdz.ch.db.domain.distribution.DistributionOrder;
+import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
+import java.util.List;
+
+public interface DistributionOrderDao {
+
+    /**
+     * 插入新记录
+     *
+     * @param distributionOrder
+     * @return
+     */
+    int insert(DistributionOrder distributionOrder);
+
+
+    /**
+     * 更新记录
+     *
+     * @param distributionOrder
+     * @return
+     */
+    int update(DistributionOrder distributionOrder);
+
+
+    /**
+     * 根据分销单号查询
+     * @param distributionOrderId
+     * @return
+     */
+    DistributionOrder findById(String distributionOrderId);
+
+    /**
+     * 根据买家id查询
+     * @param buyerId
+     * @return
+     */
+    List<DistributionOrder> findByBuyerId(long buyerId);
+
+
+    /**
+     * 根据卖家id查询
+     * @param sellerId
+     * @return
+     */
+    List<DistributionOrder> findBySellerId(long sellerId);
+
+    /**
+     *
+     * @param dto
+     * @return
+     */
+    List<DistributionOrder> findByPage(DistributionOrderRequestDto dto);
+
+    /**
+     * 根据状态统计订单数量
+     * @param buyerId
+     * @param state
+     * @return
+     */
+    Long countByStateForBuyer(long buyerId, int state);
+
+
+    /**
+     * 根据状态统计订单数量
+     * @param sellerId
+     * @param state
+     * @return
+     */
+    Long countByStateForSellerId(long sellerId, int state);
+
+    /**
+     * 更改分销订单状态
+     */
+    boolean updateState(String distributionOrderId, int state);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/DistributorShareRecordDao.java

+package com.wwdz.ch.db.dao.distribution;
+
+import com.wwdz.ch.db.domain.ConsignSaleRecord;
+import com.wwdz.ch.db.domain.distribution.DistributorShareRecord;
+
+import java.util.List;
+
+public interface DistributorShareRecordDao {
+
+    /**
+     * 插入新记录
+     *
+     * @param distributorShareRecord
+     * @return
+     */
+    int insert(DistributorShareRecord distributorShareRecord);
+
+
+    /**
+     * 根据分享id查询记录
+     * @param shareId
+     * @return
+     */
+    DistributorShareRecord findById(String shareId);
+
+}

ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/SupplierItemDao.java

+package com.wwdz.ch.db.dao.distribution;
+
+import com.wwdz.ch.db.domain.Item;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
+import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import java.util.List;
+
+/**
+ * 供应商商品
+ */
+public interface SupplierItemDao {
+
+
+    /**
+     * 查询商品列表
+     * @param supplierItemRequestDto
+     * @return
+     */
+    List<SupplierItem> findList(SupplierItemRequestDto supplierItemRequestDto);
+
+    /**
+     * 根据商品id查询
+     * @param itemId
+     * @return
+     */
+    SupplierItem findById(long itemId);
+}

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributionOrderRequestDto.java

+package com.wwdz.ch.db.dto.request.distribution;
+
+import com.wwdz.ch.db.dto.request.BaseRequestDto;
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 分销订单请求参数类
+ */
+@Data
+public class DistributionOrderRequestDto extends BaseRequestDto implements Entity {
+
+    /**
+     * 分销分享记录id
+     */
+    private String shareRecordId;
+
+    /**
+     * 商品id
+     */
+    private Long itemId;
+
+    /**
+     * 商品数量
+     */
+    private Integer itemNum;
+
+
+    /**
+     * 分销订单号
+     */
+    private String distributionOrderId;
+
+    /**
+     * 买方id
+     */
+    private Long buyerId;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 卖方id
+     */
+    private Long sellerId;
+
+    /**
+     * 买家收货地址
+     */
+    private Long addressId;
+
+    /**
+     * 买家收货地址
+     */
+    private String address;
+
+    /**
+     * 快递公司编码
+     */
+    private String logisticsCode;
+
+    /**
+     * 运单号
+     */
+    private String waybill;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 分销订单状态
+     */
+    private Integer state;
+}

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/DistributorShareRecordRequestDto.java

+package com.wwdz.ch.db.dto.request.distribution;
+
+import com.wwdz.ch.db.dto.request.BaseRequestDto;
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 分销分享链接记录参数类
+ */
+@Data
+public class DistributorShareRecordRequestDto extends BaseRequestDto implements Entity {
+
+    /**
+     * 分享记录id
+     */
+    private String shareId;
+
+    /**
+     * 分销商定的价格
+     */
+    private String price;
+
+    /**
+     * 商品id
+     */
+    private Long itemId;
+
+    /**
+     * 分销商id
+     */
+    private Long distributorId;
+
+    /**
+     * 分销商店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+}

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SupplierItemRequestDto.java

+package com.wwdz.ch.db.dto.request.distribution;
+
+import com.wwdz.ch.db.dto.request.BaseRequestDto;
+import com.xxdxxs.entity.Entity;
+import lombok.Data;
+
+/**
+ * 供应商商品请求参数类
+ */
+@Data
+public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
+
+    /**
+     * 商品id
+     */
+    private Long id;
+
+
+    /**
+     * 供应商id
+     */
+    private Long supplierId;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 创建开始时间
+     * 用于查询
+     */
+    private String startCreateTime;
+
+    /**
+     * 创建结束时间
+     * 用于查询
+     */
+    private String endCreateTime;
+
+    /**
+     * 是否上架
+     */
+    private Boolean isOnSale;
+
+    /**
+     * 逻辑删除
+     */
+    private Boolean isDeleted;
+}

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/DistributorShareRecordDaoImpl.java

+package com.wwdz.ch.db.impl.distribution;
+
+import com.wwdz.ch.db.dao.distribution.DistributorShareRecordDao;
+import com.wwdz.ch.db.domain.distribution.DistributorShareRecord;
+import com.wwdz.ch.db.domain.distribution.DistributorShareRecordExample;
+import com.wwdz.ch.db.mapper.distribution.DistributorShareRecordMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+import java.util.Date;
+
+@Repository
+public class DistributorShareRecordDaoImpl implements DistributorShareRecordDao {
+
+    @Autowired
+    DistributorShareRecordMapper distributorShareRecordMapper;
+
+    @Override
+    public int insert(DistributorShareRecord distributorShareRecord) {
+        return distributorShareRecordMapper.insert(distributorShareRecord);
+    }
+
+    @Override
+    public DistributorShareRecord findById(String shareId) {
+        DistributorShareRecordExample distributorShareRecordExample = new DistributorShareRecordExample();
+        DistributorShareRecordExample.Criteria criteria = distributorShareRecordExample.createCriteria();
+        criteria.andShareIdEqualTo(shareId);
+        return distributorShareRecordMapper.selectOneByExample(distributorShareRecordExample);
+    }
+}

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

+package com.wwdz.ch.db.impl.distribution;
+
+import com.github.pagehelper.PageHelper;
+import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
+import com.wwdz.ch.db.domain.distribution.SupplierItem;
+import com.wwdz.ch.db.domain.distribution.SupplierItemExample;
+import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
+import com.wwdz.ch.db.mapper.distribution.SupplierItemMapper;
+import com.xxdxxs.db.component.JdbcHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+import java.util.List;
+
+@Repository
+public class SupplierItemDaoImpl implements SupplierItemDao {
+
+    @Autowired
+    SupplierItemMapper supplierItemMapper;
+
+    @Override
+    public List<SupplierItem> findList(SupplierItemRequestDto dto) {
+        SupplierItemExample supplierItemExample = new SupplierItemExample();
+        SupplierItemExample.Criteria criteria = supplierItemExample.createCriteria();
+        JdbcHelper.ifPresent(dto.getId(), criteria::andIdEqualTo);
+        JdbcHelper.ifPresent(dto.getIsOnSale(), criteria::andIsOnSaleEqualTo);
+        JdbcHelper.ifPresent(dto.getIsDeleted(), criteria::andIsDeletedEqualTo);
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        return supplierItemMapper.selectByExampleWithBLOBs(supplierItemExample);
+    }
+
+    @Override
+    public SupplierItem findById(long itemId) {
+        SupplierItemExample supplierItemExample = new SupplierItemExample();
+        SupplierItemExample.Criteria criteria = supplierItemExample.createCriteria();
+        criteria.andIdEqualTo(itemId);
+        return supplierItemMapper.selectOneByExampleWithBLOBs(supplierItemExample);
+    }
+}

ch-wx-api/pom.xml

@@ -37,6 +37,8 @@
             <version>${project.version}</version>
         </dependency>
 
+
+
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-pay</artifactId>