提交修改

api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvSellerDao.java

@@ -7,30 +7,50 @@ package com.heyu.api.data.dao.vv;
 * @author quyixiao
 * @since 2025-08-26
 */
-import com.heyu.api.data.entity.vv.VvSellerEntity;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.heyu.api.data.entity.vv.VvSellerEntity;
+import com.lz.mybatis.plugin.annotations.IF;
+import com.lz.mybatis.plugin.annotations.OrderBy;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface VvSellerDao extends BaseMapper<VvSellerEntity> {
 
 
-	VvSellerEntity selectVvSellerById(@Param("id")Long id);
+    VvSellerEntity selectVvSellerById(@Param("id") Long id);
 
 
-	Long insertVvSeller(VvSellerEntity vvSeller);
+    Long insertVvSeller(VvSellerEntity vvSeller);
 
 
-	Long insertOrUpdateVvSeller(VvSellerEntity vvSeller);
+    Long insertOrUpdateVvSeller(VvSellerEntity vvSeller);
 
 
-	int updateVvSellerById(VvSellerEntity vvSeller);
+    int updateVvSellerById(VvSellerEntity vvSeller);
 
 
-	int updateCoverVvSellerById(VvSellerEntity vvSeller);
+    int updateCoverVvSellerById(VvSellerEntity vvSeller);
+
+
+    int deleteVvSellerById(@Param("id") Long id);
+
+
+
+
+    @OrderBy(VvSellerEntity.id_)
+    List<VvSellerEntity> selectByAdminCondition(IPage page,
+                                                @IF Long id,
+                                                @IF String sellerName,
+                                                @IF @OrderBy(VvSellerEntity.create_timestamp) String createTimestampSort,
+                                                @IF @OrderBy(VvSellerEntity.modify_timestamp) String modifyTimestampSort
+    );
 
 
-	int deleteVvSellerById(@Param("id")Long id);
 
 
 }

api-mapper/src/main/java/com/heyu/api/data/dto/SellerDTO.java

@@ -0,0 +1,12 @@
+package com.heyu.api.data.dto;
+
+import com.heyu.api.data.entity.vv.VvSellerEntity;
+import lombok.Data;
+
+
+@Data
+public class SellerDTO extends VvSellerEntity {
+
+
+
+}

api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvSellerEntity.java

@@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date;
 /**
 *卖家表
 * @author quyixiao
-* @since 2025-08-26
+* @since 2025-11-19
 */
 
 @Data
@@ -32,6 +32,8 @@ private static final long serialVersionUID = 1L;
     public final static String seller_sale_gmv = CLASS_NAME + "seller_sale_gmv";        // 在平台上，我们已经销售金额
     public final static String refund_origin_gmv = CLASS_NAME + "refund_origin_gmv";    // 退款原始金额
     public final static String refund_sale_gmv = CLASS_NAME + "refund_sale_gmv";        // 退款销售金额
+    public final static String create_timestamp = CLASS_NAME + "create_timestamp";      // 创建时间
+    public final static String modify_timestamp = CLASS_NAME + "modify_timestamp";      // 修改时间
     //
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
@@ -55,6 +57,10 @@ private static final long serialVersionUID = 1L;
     private BigDecimal refundOriginGmv;
     //退款销售金额
     private BigDecimal refundSaleGmv;
+    //创建时间
+    private Long createTimestamp;
+    //修改时间
+    private Long modifyTimestamp;
     /**
      *  
      * @return
@@ -220,6 +226,36 @@ private static final long serialVersionUID = 1L;
         this.refundSaleGmv = refundSaleGmv;
     }
 
+    /**
+     * 创建时间 
+     * @return
+     */
+    public Long getCreateTimestamp() {
+        return createTimestamp;
+    }
+    /**
+     * 创建时间 
+     * @param createTimestamp
+     */
+    public void setCreateTimestamp(Long createTimestamp) {
+        this.createTimestamp = createTimestamp;
+    }
+
+    /**
+     * 修改时间 
+     * @return
+     */
+    public Long getModifyTimestamp() {
+        return modifyTimestamp;
+    }
+    /**
+     * 修改时间 
+     * @param modifyTimestamp
+     */
+    public void setModifyTimestamp(Long modifyTimestamp) {
+        this.modifyTimestamp = modifyTimestamp;
+    }
+
     @Override
     public String toString() {
         return "VvSellerEntity{" +
@@ -234,6 +270,8 @@ private static final long serialVersionUID = 1L;
                 ",sellerSaleGmv=" + sellerSaleGmv +
                 ",refundOriginGmv=" + refundOriginGmv +
                 ",refundSaleGmv=" + refundSaleGmv +
+                ",createTimestamp=" + createTimestamp +
+                ",modifyTimestamp=" + modifyTimestamp +
                 "}";
     }
 }

api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java

@@ -49,7 +49,7 @@ public class MysqlMain_update {
         List<TablesBean> list = new ArrayList<TablesBean>();
 
 
-        list.add(new TablesBean("vv_comment"));
+        list.add(new TablesBean("vv_seller"));
 
 
 

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVSellerRequest.java

@@ -0,0 +1,40 @@
+package com.heyu.api.alibaba.request.mm.order;
+
+
+import com.heyu.api.alibaba.request.mm.AdminBaseDTO;
+import lombok.Data;
+
+@Data
+public class VVSellerRequest extends AdminBaseDTO {
+
+
+    private Integer pageNum = 1;
+
+    private Integer pageSize = 10;
+
+
+    /***
+     * 卖家id
+     */
+    private Long sellerId;
+
+    /***
+     * 卖家名称
+     */
+    private String sellerName;
+    /**
+     *
+     * 按创建时间排序 , ASC 升序  ,DESC 降序
+     */
+    private String createTimestampSort;
+
+    /**
+     *
+     * 按修改时间排序 , ASC 升序  ,DESC 降序
+     */
+    private String modifyTimestampSort;
+
+
+}
+
+

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java

@@ -34,9 +34,11 @@ public class VvToShippingDTO extends AdminBaseDTO {
 
     //卖家id
     private Long sellerId;
+
     //卖家仓库地址id
     private Long sellerWarehouseId;
 
+
     public static void main(String[] args) {
 
         VvToShippingDTO vvToPackDTO = new VvToShippingDTO();

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java

@@ -7,8 +7,6 @@ import lombok.Data;
 @Data
 public class VvAdminLogisticsRequest extends AppBaseRequest {
 
-
-
     /***
      *
      *  物流单号

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminLogisticsController.java

@@ -6,19 +6,15 @@ import com.heyu.api.common.annotation.Describe;
 import com.heyu.api.data.dao.vv.VvPackageDao;
 import com.heyu.api.data.dao.vv.VvTradeOrderLineDao;
 import com.heyu.api.data.dto.vv.KuaiDi100DTO;
-import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
 import com.heyu.api.data.enums.RoleEnums;
 import com.heyu.api.data.service.vv.VvPackageService;
 import com.heyu.api.data.utils.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Slf4j
 @RestController
 @RequestMapping("/mm/logistics")
@@ -38,10 +34,6 @@ public class AdminLogisticsController {
     @Describe("后台物流查询")
     @RequestMapping("/query")
     public R query(@RequestBody VvAdminLogisticsRequest request) {
-        List<VvTradeOrderLineEntity> vvTradeOrderLineEntity = vvTradeOrderLineDao.selectVvTradeOrderLineByBuyerIdTrackNumber(request.getBuyerId(), request.getTrackNumber());
-        if (CollectionUtils.isEmpty(vvTradeOrderLineEntity)) {
-            return R.error("trackNumber不是你的");
-        }
         KuaiDi100DTO kuaiDi100DTO = vvPackageService.selectVvKuaidiAndUpdateData(request.getTrackNumber(), RoleEnums.user.getRole(),false);
         return R.ok().setData(kuaiDi100DTO);
     }

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminSellerController.java

@@ -0,0 +1,55 @@
+package com.heyu.api.controller.mm;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.heyu.api.alibaba.request.mm.order.VVSellerRequest;
+import com.heyu.api.common.annotation.Describe;
+import com.heyu.api.data.dao.vv.VvSellerDao;
+import com.heyu.api.data.dao.vv.VvSellerWarehouseDao;
+import com.heyu.api.data.utils.R;
+import com.heyu.api.utils.ISelect;
+import com.heyu.api.utils.PPageUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequestMapping("/mm/seller")
+public class AdminSellerController {
+
+    @Autowired
+    private VvSellerDao vvSellerDao;
+
+
+    @Autowired
+    private VvSellerWarehouseDao vvSellerWarehouseDao;
+
+    /***
+     * 列表
+     *  http://localhost:8888/mm/seller/list
+     */
+    @Describe("后台订单列表")
+    @RequestMapping("/list")
+    public R list(@RequestBody VVSellerRequest request) {
+        PPageUtils pageUtils = PPageUtils.startPage(request.getPageNum(), request.getPageSize())
+                .doSelect(new ISelect() {
+                    @Override
+                    public List doSelect(IPage page) {
+                        return vvSellerDao.selectByAdminCondition(page,
+                                request.getSellerId(),
+                                request.getSellerName(),
+                                request.getCreateTimestampSort(),
+                                request.getModifyTimestampSort()
+                        );
+                    }
+                });
+
+        return R.ok().setData(pageUtils);
+    }
+
+}