From 9b46e9e116c0f2a51a496da2fb24502ece01f5cd Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 18:12:55 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index f098231..c9de79c 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -37,9 +37,11 @@
import com.github.binarywang.wxpay.bean.request.BaseWxPayRequest;
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
+import com.github.binarywang.wxpay.bean.result.WxPayRefundV3Result;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
import okhttp3.Address;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -436,7 +438,6 @@
queryWrapper.eq(pageWrap.getModel().getPayOrderId()!=null,Goodsorder::getPayOrderId,pageWrap.getModel().getPayOrderId());
queryWrapper.eq(pageWrap.getModel().getStatus()!=null,Goodsorder::getStatus,pageWrap.getModel().getStatus());
queryWrapper.eq(pageWrap.getModel().getIsdeleted()==null,Goodsorder::getIsdeleted,Constants.ZERO);
- queryWrapper.eq(pageWrap.getModel().getIsdeleted()!=null,Goodsorder::getIsdeleted,pageWrap.getModel().getIsdeleted());
queryWrapper.orderByDesc(Goodsorder::getCreateDate);
IPage<Goodsorder> result = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
@@ -493,6 +494,82 @@
}
return PageData.from(result);
}
+ @Override
+ public PageData<Goodsorder> findPageShop(PageWrap<Goodsorder> pageWrap) {
+ IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+
+ queryWrapper.selectAll(Goodsorder.class)
+ .eq(pageWrap.getModel().getDistributionShopId()!=null,Goodsorder::getDistributionShopId,pageWrap.getModel().getDistributionShopId())
+ .eq(pageWrap.getModel().getStatus()!=null,Goodsorder::getStatus,pageWrap.getModel().getStatus())
+ .eq(pageWrap.getModel().getCode()!=null,Goodsorder::getCode,pageWrap.getModel().getCode())
+ .ge(pageWrap.getModel().getStarttime()!=null,Goodsorder::getCreateDate,pageWrap.getModel().getStarttime())
+ .le(pageWrap.getModel().getEndtime()!=null,Goodsorder::getCreateDate, pageWrap.getModel().getEndtime())
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO)
+ .exists(StringUtils.isNotBlank(pageWrap.getModel().getGoodsName()),
+ "select d.id from goodsorder_detail d where d.isdeleted=0 and d.order_id=t.id and (d.goods_sku_id ='"+pageWrap.getModel().getGoodsName()+"' or d.name like '%"+pageWrap.getModel().getGoodsName()+"%')")
+ .orderByDesc(Goodsorder::getCreateDate);
+ IPage<Goodsorder> result = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
+ PageData<Goodsorder> rr = PageData.from(result);
+ if(result!=null && result.getRecords().size()>0) {
+ List<Integer> idList = new ArrayList<>();
+ for(Goodsorder model:result.getRecords()){
+ idList.add(model.getId());
+ }
+ MPJLambdaWrapper<GoodsorderDetail> queryGoods = new MPJLambdaWrapper<>();
+ queryGoods.selectAll(GoodsorderDetail.class);
+ queryGoods.in(GoodsorderDetail::getOrderId,idList);
+ queryGoods.eq(GoodsorderDetail::getIsdeleted,Constants.ZERO);
+ queryGoods.and( StringUtils.isNotBlank(pageWrap.getModel().getGoodsName()),w ->{
+ w.like(GoodsorderDetail::getName,pageWrap.getModel().getGoodsName() ).or().eq(GoodsorderDetail::getGoodsSkuId,pageWrap.getModel().getGoodsName());
+ } );
+ List<GoodsorderDetail> goodsorderDetailList=goodsorderDetailJoinMapper.selectList(queryGoods);
+ for(Goodsorder model:result.getRecords()){
+ model.setGoodsorderDetailList(getDetailListById(goodsorderDetailList,model.getId()));
+ }
+ if(pageWrap.getPage() == 1 && pageWrap.getModel().getDistributionShopId()!=null){
+ //濡傛灉鏌ヨ绗竴椤碉紝鍋氱粡閿�鍟嗛攢鍞俊鎭粺璁′笟鍔℃煡璇�
+ Goodsorder count = new Goodsorder();
+ count.setOrderCount(rr.getTotal());
+ List<GoodsorderDetail> list = goodsorderDetailJoinMapper.selectJoinList(GoodsorderDetail.class,new MPJLambdaWrapper<GoodsorderDetail>()
+ .selectAll(GoodsorderDetail.class)
+ .leftJoin(Goodsorder.class,Goodsorder::getId,GoodsorderDetail::getOrderId)
+ .eq(pageWrap.getModel().getDistributionShopId()!=null,Goodsorder::getDistributionShopId,pageWrap.getModel().getDistributionShopId())
+ .eq(pageWrap.getModel().getStatus()!=null,Goodsorder::getStatus,pageWrap.getModel().getStatus())
+ .and( StringUtils.isNotBlank(pageWrap.getModel().getGoodsName()),w ->{
+ w.like(GoodsorderDetail::getName,pageWrap.getModel().getGoodsName() ).or().eq(GoodsorderDetail::getGoodsSkuId,pageWrap.getModel().getGoodsName());
+ } )
+ .eq(pageWrap.getModel().getCode()!=null,Goodsorder::getCode,pageWrap.getModel().getCode())
+ .ge(pageWrap.getModel().getStarttime()!=null,Goodsorder::getCreateDate,pageWrap.getModel().getStarttime())
+ .le(pageWrap.getModel().getEndtime()!=null,Goodsorder::getCreateDate, pageWrap.getModel().getEndtime())
+ .eq(Goodsorder::getIsdeleted,Constants.ZERO));
+ if(list!=null && list.size()>0){
+ //鍟嗗搧鎬婚噺
+ for (GoodsorderDetail d : list){
+ count.setGoodsNum(Constants.formatIntegerNum(count.getGoodsNum()) + Constants.formatIntegerNum(d.getGoodsNum()));
+ count.setOrderMoneyCount(Constants.formatBigdecimal(count.getOrderMoneyCount())
+ .add(Constants.formatBigdecimal(d.getPrice()).multiply(new BigDecimal(Constants.formatIntegerNum(d.getGoodsNum())))));
+ }
+ }
+ rr.setCountData(count);
+ }
+ }
+
+
+
+ return rr;
+ }
+
+ private List<GoodsorderDetail> getDetailListById(List<GoodsorderDetail> goodsorderDetailList, Integer id) {
+ List<GoodsorderDetail> list = new ArrayList<>();
+ for(GoodsorderDetail d : goodsorderDetailList){
+ if(Constants.equalsInteger(id,d.getOrderId())){
+ list.add(d);
+ }
+ }
+ return list;
+ }
@Override
--
Gitblit v1.9.3