From d8d6661b4736e5de37d4a158b8286509b748d62b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 22 一月 2026 18:16:54 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 217 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 142 insertions(+), 75 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 0663bae..7634794 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
@@ -78,6 +78,8 @@
@Autowired
private GoodsorderMapper goodsorderMapper;
@Autowired
+ private UserActionMapper userActionMapper;
+ @Autowired
private ActivitySignMapper activitySignMapper;
@Autowired
private AftersaleMapper aftersaleMapper;
@@ -240,22 +242,47 @@
@Override
public void orderSendOutGoods(Goodsorder goodsorder) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
-
+ if(StringUtils.isBlank(goodsorder.getKdCode()) ||StringUtils.isBlank(goodsorder.getKdName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
Goodsorder query=goodsorderMapper.selectById(goodsorder.getId());
if(query==null){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),ResponseStatus.DATA_EMPTY.getMessage());
}
- if(!Constants.equalsInteger(query.getStatus(),Constants.ONE)){
+ if(!Constants.equalsInteger(query.getStatus(),Constants.OrderStatus.PAY_DONE.getKey())
+ && !Constants.equalsInteger(query.getStatus(),Constants.OrderStatus.WAIT_RECEIVE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁㈠崟鐘舵�佸凡娴佽浆锛岃鍒锋柊椤甸潰锛�");
}
- goodsorder.setEditDate(new Date());
- goodsorder.setEditor(user.getId());
- goodsorder.setKdDate(new Date());
- goodsorder.setKdUser(user.getId());
- goodsorder.setStatus(Constants.OrderStatus.WAIT_RECEIVE.getKey());
- goodsorderMapper.updateById(goodsorder);
+ if(!Constants.equalsInteger(query.getReceiveType(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ヨ鍗曟湁瀹㈡埛鍒板簵鑷彁锛屾棤闇�鍙戣揣鎿嶄綔锛�");
+ }
+ Goodsorder update = new Goodsorder();
+ update.setId(goodsorder.getId());
+ update.setKdName(goodsorder.getKdName());
+ update.setKdCode(goodsorder.getKdCode());
+ update.setKdInfo(goodsorder.getKdInfo());
+ update.setKdId(goodsorder.getKdId());
+ update.setEditDate(new Date());
+ update.setEditor(user.getId());
+ update.setKdDate(new Date());
+ update.setKdUser(user.getId());
+ update.setStatus(Constants.OrderStatus.WAIT_RECEIVE.getKey());
+ goodsorderMapper.updateById(update);
- // TODO 鍙戦�佸井淇℃ā鏉挎秷鎭�
+ if(Constants.equalsInteger(query.getStatus(), Constants.OrderStatus.WAIT_RECEIVE.getKey())){
+ //濡傛灉鏄揩閫掑彉鏇�
+ UserActionServiceImpl.saveUserActionBiz(user,query.getId(),
+ Constants.UserActionType.CHANGE_ORDER_KD,
+ userActionMapper,
+ update.getEditDate(),
+ new String[]{user.getUsername(), DateUtil.getPlusTime2(update.getEditDate()),"澶囨敞锛�"+goodsorder.getKdInfo()},
+ JSONObject.toJSONString(update) ,
+ query.getKdName()+"(鍗曞彿锛�"+query.getKdCode()+")",
+ goodsorder.getKdName()+"(鍗曞彿锛�"+goodsorder.getKdCode()+")");
+
+ }
+
+ /* // TODO 鍙戦�佸井淇℃ā鏉挎秷鎭�
Member member=memberMapper.selectById(query.getMemberId());
MPJLambdaWrapper<GoodsorderDetail> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.eq(GoodsorderDetail::getIsdeleted,Constants.ZERO);
@@ -263,7 +290,7 @@
queryWrapper.orderByDesc(GoodsorderDetail::getCreateDate);
queryWrapper.last("limit 1");
GoodsorderDetail goodsorderDetail=goodsorderDetailMapper.selectOne(queryWrapper);
- SendWxMessage.orderSendNotice(goodsorder,goodsorderDetail!=null?goodsorderDetail.getName():"",member);
+ SendWxMessage.orderSendNotice(goodsorder,goodsorderDetail!=null?goodsorderDetail.getName():"",member);*/
}
@@ -381,12 +408,14 @@
if(Objects.nonNull(result)){
MPJLambdaWrapper<GoodsorderDetail> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(GoodsorderDetail.class);
+ queryWrapper.selectAs(Shop::getName,Goodsorder::getShopName);
queryWrapper.selectAs(Labels::getName,GoodsorderDetail::getLablesName);
queryWrapper.eq(GoodsorderDetail::getIsdeleted,Constants.ZERO);
queryWrapper.eq(GoodsorderDetail::getOrderId,result.getId());
queryWrapper.leftJoin(GoodsSku.class,GoodsSku::getId,GoodsorderDetail::getGoodsSkuId);
queryWrapper.leftJoin(Goods.class,Goods::getId,GoodsSku::getGoodsId);
queryWrapper.leftJoin(Labels.class,Labels::getId,Goods::getCategoryId);
+ queryWrapper.leftJoin(Shop.class,Shop::getId,Goodsorder::getDistributionShopId);
List<GoodsorderDetail> goodsorderDetailList=goodsorderDetailMapper.selectList(queryWrapper);
String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.ACTIVITY_FILE).getCode();
@@ -426,82 +455,113 @@
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
-
queryWrapper.selectAll(Goodsorder.class);
- queryWrapper.selectAs(Member::getNickname,Goodsorder::getNickName);
- queryWrapper.selectAs(Member::getPhone,Goodsorder::getPhone);
- queryWrapper.selectAs(Addr::getAddr,Goodsorder::getAddr);
- // queryWrapper.select("(select CREATE_DATE from order_urge where ORDER_ID=t.id and ISDELETED=0 ORDER BY CREATE_DATE desc limit 1) as urgeCreateDate ");
- queryWrapper.leftJoin(Member.class,Member::getId,Goodsorder::getMemberId);
- queryWrapper.leftJoin(Addr.class,Addr::getMemberId,Member::getId);
- queryWrapper.eq(Addr::getIsDefault,Constants.ONE);
-
- queryWrapper.eq(pageWrap.getModel().getCode()!=null,Goodsorder::getCode,pageWrap.getModel().getCode());
- queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getNickName()),ms->ms.like(Goodsorder::getLinkname,pageWrap.getModel().getNickName())
- .or().like(Goodsorder::getLinkphone,pageWrap.getModel().getNickName())
- );
- queryWrapper.ge(pageWrap.getModel().getStarttime()!=null,Goodsorder::getCreateDate,pageWrap.getModel().getStarttime());
- queryWrapper.le(pageWrap.getModel().getEndtime()!=null,Goodsorder::getCreateDate, pageWrap.getModel().getEndtime());
-
- queryWrapper.eq(pageWrap.getModel().getPayOrderId()!=null,Goodsorder::getPayOrderId,pageWrap.getModel().getPayOrderId());
+ queryWrapper.selectAs(Shop::getName,Goodsorder::getShopName);
+ initPageQueryWrapper(queryWrapper,pageWrap);
queryWrapper.eq(pageWrap.getModel().getStatus()!=null,Goodsorder::getStatus,pageWrap.getModel().getStatus());
- queryWrapper.eq(pageWrap.getModel().getIsdeleted()==null,Goodsorder::getIsdeleted,Constants.ZERO);
queryWrapper.orderByDesc(Goodsorder::getCreateDate);
IPage<Goodsorder> result = goodsorderJoinMapper.selectJoinPage(page, Goodsorder.class, queryWrapper);
- String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_FILE).getCode();
-
+ List<Integer> idList = new ArrayList<>();
for(Goodsorder model:result.getRecords()){
- model.setResourcePath(path);
- //璁㈠崟鎬婚噾棰濈瓑浜庡疄浠橀噾棰濆姞浼樻儬閲戦锛屽啀鍑忓幓閫�娆鹃噾棰�
- BigDecimal sumMoney=new BigDecimal(0);
- if(model.getPrice()!=null){
- if(model.getIntegral()!=null){
- sumMoney=model.getPrice().add(model.getIntegral());
- if(Constants.equalsInteger(model.getIsAftersale(),Constants.ONE)&&model.getAftersaleMoney()!=null){
- sumMoney.subtract(model.getAftersaleMoney());
- model.setOrderMoneyCount(sumMoney);
- }else{
- model.setOrderMoneyCount(sumMoney);
- }
- }else{
- model.setOrderMoneyCount(model.getPrice());
- }
- }else if(model.getIntegral()!=null){
- sumMoney=model.getIntegral();
+ idList.add(model.getId());
+ }
+ if(idList.size()>0){
+ dealOrderDetailsBiz(idList,result);//鏌ヨ璁㈠崟鏄庣粏
+ }
+ PageData<Goodsorder> rr = PageData.from(result);
+ if(pageWrap.getPage() == 1){
+ //濡傛灉鏌ヨ绗竴椤碉紝鍋氭暟鎹粺璁�
+ rr.setCountData(dealCountOrderNum(pageWrap));
+ }
+ return rr;
+ }
+
+ private void initPageQueryWrapper(MPJLambdaWrapper<Goodsorder> queryWrapper, PageWrap<Goodsorder> pageWrap) {
+ queryWrapper.leftJoin(Shop.class,Shop::getId,Goodsorder::getDistributionShopId);
+ queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(pageWrap.getModel().getCode()!=null,Goodsorder::getCode,pageWrap.getModel().getCode());
+ queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getShopName()),Shop::getName,pageWrap.getModel().getShopName());
+ queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getNickName()),ms->ms.like(Goodsorder::getLinkname,pageWrap.getModel().getNickName())
+ .or().like(Goodsorder::getLinkphone,pageWrap.getModel().getNickName())
+ );
+ queryWrapper.ge(pageWrap.getModel().getStarttime()!=null,Goodsorder::getCreateDate,pageWrap.getModel().getStarttime());
+ queryWrapper.le(pageWrap.getModel().getEndtime()!=null,Goodsorder::getCreateDate, pageWrap.getModel().getEndtime());
+ queryWrapper.eq(pageWrap.getModel().getReceiveType()!=null,Goodsorder::getReceiveType,pageWrap.getModel().getReceiveType());
+ queryWrapper.eq(pageWrap.getModel().getPayOrderId()!=null,Goodsorder::getPayOrderId,pageWrap.getModel().getPayOrderId());
+ }
+
+
+ private Goodsorder dealCountOrderNum( PageWrap<Goodsorder> pageWrap) {
+ MPJLambdaWrapper<Goodsorder> queryWrapper = new MPJLambdaWrapper<>();
+ initPageQueryWrapper(queryWrapper,pageWrap);
+ Goodsorder goodsorder = new Goodsorder();
+ queryWrapper.eq( Goodsorder::getStatus,Constants.OrderStatus.WAIT_PAY.getKey());
+ goodsorder.setWaitPayNum(goodsorderJoinMapper.selectJoinCount(queryWrapper));//寰呮敮浠�
+
+ queryWrapper = new MPJLambdaWrapper<>();
+ initPageQueryWrapper(queryWrapper,pageWrap);
+ queryWrapper.eq( Goodsorder::getStatus,Constants.OrderStatus.PAY_DONE.getKey());
+ goodsorder.setWaitKdNum(goodsorderJoinMapper.selectJoinCount(queryWrapper));//寰呭彂璐э紝寰呰嚜鎻�
+
+ queryWrapper = new MPJLambdaWrapper<>();
+ initPageQueryWrapper(queryWrapper,pageWrap);
+ queryWrapper.eq( Goodsorder::getStatus,Constants.OrderStatus.WAIT_RECEIVE.getKey());
+ goodsorder.setWaitDoneNum(goodsorderJoinMapper.selectJoinCount(queryWrapper));//寰呮敹璐�
+ return goodsorder;
+
+ }
+
+ private void dealOrderDetailsBiz(List<Integer> idList, IPage<Goodsorder> result) {
+ MPJLambdaWrapper<GoodsorderDetail> queryGoods = new MPJLambdaWrapper<>();
+ queryGoods.selectAll(GoodsorderDetail.class);
+ queryGoods.selectAs(Goods::getImgurl,GoodsorderDetail::getGoodsImgurl);
+ queryGoods.selectAs(Labels::getName, GoodsorderDetail::getCategoryName);
+ queryGoods.select("ls.name as parentName ");
+
+ queryGoods.leftJoin(GoodsSku.class,GoodsSku::getId,GoodsorderDetail::getGoodsSkuId);
+ queryGoods.leftJoin(Goods.class,Goods::getId,GoodsSku::getGoodsId);
+
+ queryGoods.leftJoin(Labels.class, Labels::getId, Goods::getCategoryId);
+ queryGoods.leftJoin("labels ls on ls.id=t2.PARENT_CATEGORY_ID");
+ queryGoods.in(GoodsorderDetail::getOrderId,idList);
+ queryGoods.eq(GoodsorderDetail::getIsdeleted,Constants.ZERO);
+ List<GoodsorderDetail> goodsorderDetailList=goodsorderDetailJoinMapper.selectList(queryGoods);
+ String fullUrl = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.GOODS_FILE).getCode();
+ for(Goodsorder model :result.getRecords()){
+ initOrderPrice(model);
+ model.setGoodsorderDetailList(getDetailListById(fullUrl,goodsorderDetailList,model.getId()));
+ }
+ }
+
+ private void initOrderPrice(Goodsorder model) {
+ //璁㈠崟鎬婚噾棰濈瓑浜庡疄浠橀噾棰濆姞浼樻儬閲戦锛屽啀鍑忓幓閫�娆鹃噾棰�
+ BigDecimal sumMoney=new BigDecimal(0);
+ if(model.getPrice()!=null){
+ if(model.getIntegral()!=null){
+ sumMoney=model.getPrice().add(model.getIntegral());
if(Constants.equalsInteger(model.getIsAftersale(),Constants.ONE)&&model.getAftersaleMoney()!=null){
sumMoney.subtract(model.getAftersaleMoney());
model.setOrderMoneyCount(sumMoney);
}else{
model.setOrderMoneyCount(sumMoney);
}
+ }else{
+ model.setOrderMoneyCount(model.getPrice());
}
-
-
- MPJLambdaWrapper<GoodsorderDetail> queryGoods = new MPJLambdaWrapper<>();
- queryGoods.selectAll(GoodsorderDetail.class);
- queryGoods.selectAs(Goods::getImgurl,GoodsorderDetail::getGoodsImgurl);
- queryGoods.selectAs(Labels::getName, GoodsorderDetail::getCategoryName);
- queryGoods.select("ls.name as parentName ");
-
- queryGoods.leftJoin(GoodsSku.class,GoodsSku::getId,GoodsorderDetail::getGoodsSkuId);
- queryGoods.leftJoin(Goods.class,Goods::getId,GoodsSku::getGoodsId);
-
- queryGoods.leftJoin(Labels.class, Labels::getId, Goods::getCategoryId);
- queryGoods.leftJoin("labels ls on ls.id=t2.PARENT_CATEGORY_ID");
- queryGoods.eq(GoodsorderDetail::getOrderId,model.getId());
- queryGoods.eq(GoodsorderDetail::getIsdeleted,Constants.ZERO);
- List<GoodsorderDetail> goodsorderDetailList=goodsorderDetailJoinMapper.selectList(queryGoods);
- goodsorderDetailList.stream().forEach(s ->{
- if(StringUtils.isBlank(s.getImgurl())){
- s.setImgurl(s.getGoodsImgurl());
- }
- });
- model.setGoodsorderDetailList(goodsorderDetailList);
+ }else if(model.getIntegral()!=null){
+ sumMoney=model.getIntegral();
+ if(Constants.equalsInteger(model.getIsAftersale(),Constants.ONE)&&model.getAftersaleMoney()!=null){
+ sumMoney.subtract(model.getAftersaleMoney());
+ model.setOrderMoneyCount(sumMoney);
+ }else{
+ model.setOrderMoneyCount(sumMoney);
+ }
}
- return PageData.from(result);
}
+
@Override
public PageData<Goodsorder> findPageShop(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -533,8 +593,10 @@
w.like(GoodsorderDetail::getName,pageWrap.getModel().getGoodsName() ).or().eq(GoodsorderDetail::getGoodsSkuId,pageWrap.getModel().getGoodsName());
} );
List<GoodsorderDetail> goodsorderDetailList=goodsorderDetailJoinMapper.selectList(queryGoods);
+ String fullUrl = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.GOODS_FILE).getCode();
for(Goodsorder model:result.getRecords()){
- model.setGoodsorderDetailList(getDetailListById(goodsorderDetailList,model.getId()));
+ model.setGoodsorderDetailList(getDetailListById(fullUrl,goodsorderDetailList,model.getId()));
}
if(pageWrap.getPage() == 1 && pageWrap.getModel().getDistributionShopId()!=null){
//濡傛灉鏌ヨ绗竴椤碉紝鍋氱粡閿�鍟嗛攢鍞俊鎭粺璁′笟鍔℃煡璇�
@@ -569,11 +631,16 @@
return rr;
}
- private List<GoodsorderDetail> getDetailListById(List<GoodsorderDetail> goodsorderDetailList, Integer id) {
+ private List<GoodsorderDetail> getDetailListById( String fullUrl ,List<GoodsorderDetail> goodsorderDetailList, Integer id) {
List<GoodsorderDetail> list = new ArrayList<>();
- for(GoodsorderDetail d : goodsorderDetailList){
- if(Constants.equalsInteger(id,d.getOrderId())){
- list.add(d);
+ if(goodsorderDetailList!=null && goodsorderDetailList.size()>0){
+ for(GoodsorderDetail d : goodsorderDetailList){
+ if(Constants.equalsInteger(id,d.getOrderId())){
+ if(d.getImgurl()!=null){
+ d.setImgurl(fullUrl+d.getImgurl());
+ }
+ list.add(d);
+ }
}
}
return list;
--
Gitblit v1.9.3