From 11c5ab8d97809bdeddb60b22a4fe161a67aa3b05 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 16:03:17 +0800
Subject: [PATCH] 小程序   接口开发

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java |  111 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 101 insertions(+), 10 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index f84dfc7..1ced986 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -1,6 +1,6 @@
 package com.doumee.service.business.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.alibaba.fastjson.JSONObject;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.config.Jwt.JwtPayLoad;
 import com.doumee.config.Jwt.JwtTokenUtil;
@@ -11,6 +11,7 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
 import com.doumee.dao.business.*;
 import com.doumee.dao.business.join.GoodsorderJoinMapper;
@@ -23,6 +24,7 @@
 import com.doumee.dao.business.model.ShopScan;
 import com.doumee.dao.system.SystemUserMapper;
 import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.vo.ShopMoneyVO;
 import com.doumee.dao.web.dto.*;
 import com.doumee.dao.web.dto.shop.*;
 import com.doumee.dao.web.request.MyCustomerRequest;
@@ -38,12 +40,9 @@
 import org.apache.shiro.SecurityUtils;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.xpath.operations.Bool;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -63,6 +62,15 @@
 
     @Autowired
     private ShopMapper shopMapper;
+    @Autowired
+    private UserActionMapper userActionMapper;
+
+    @Autowired
+    private GoodsMapper goodsMapper;
+    @Autowired
+    private GoodsSkuMapper goodsSkuMapper;
+    @Autowired
+    private ShopGoodsRelationMapper shopGoodsRelationMapper;
 
     @Autowired
     private ShopCommentService shopCommentService;
@@ -215,15 +223,33 @@
     }
 
     @Override
+    @Transactional
     public void updateById(Shop shop) {
         LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
         if(shop.getId()==null ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
         }
         isCreateParamValid(shop,user);
+        Shop model = shopMapper.selectById(shop.getId());
+        if(model.getId()==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE) ){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
         shop.setEditor(user.getId());
         shop.setEditDate(new Date());
+
         shopMapper.updateById(shop);
+        if(shop.getSaleType() !=null && !Constants.equalsInteger(shop.getSaleType(),model.getSaleType())){
+            //濡傛灉閿�鍞ā寮忓彂鐢熺紪鐮侊紝璁板綍鍙樻洿璁板綍
+            //鏇存崲鏃ュ織璁板綍
+            UserActionServiceImpl.saveUserActionBiz(user,shop.getId(),
+                    Constants.UserActionType.CHANGE_SALETYPE,
+                    userActionMapper,
+                    shop.getEditDate(),
+                    new String[]{user.getUsername(), DateUtil.getPlusTime2(shop.getEditDate())},
+                    JSONObject.toJSONString(shop) ,
+                    Constants.equalsInteger(model.getSaleType(),Constants.ONE)?"鑷敱閲囪喘":"骞冲彴閾鸿揣",
+                    Constants.equalsInteger(shop.getSaleType(),Constants.ONE)?"鑷敱閲囪喘":"骞冲彴閾鸿揣");
+        }
     }
 
 
@@ -313,9 +339,7 @@
        Shop shop= shopJoinMapper.selectJoinOne(Shop.class,queryWrapper);
         String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                 + systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHOP_FILE).getCode();
-        if(Objects.nonNull(shop)&&StringUtils.isNotBlank(shop.getImgurl())){
-            shop.setImgFullUrl(path+shop.getImgurl());
-        }
+        shop.setImgFullUrl(path);
         shop.setAreas(AreasServiceImpl.getAddressByAreaId(shop.getAreaId()));
         if(shop.getLatitude()!=null && shop.getLongitude()!=null){
             shop.setLocationInfo(shop.getLatitude().doubleValue()+","+shop.getLongitude().doubleValue());
@@ -330,6 +354,7 @@
         return shop;
     }
 
+
     @Override
     public Shop findOne(Shop shop) {
         QueryWrapper<Shop> wrapper = new QueryWrapper<>(shop);
@@ -338,6 +363,7 @@
 
     @Override
     public List<Shop> findList(Shop shop) {
+        shop.setIsdeleted(Constants.ZERO);
         QueryWrapper<Shop> wrapper = new QueryWrapper<>(shop);
         return shopMapper.selectList(wrapper);
     }
@@ -349,6 +375,10 @@
         Utils.MP.blankToNull(pageWrap.getModel());
 
         queryWrapper.selectAll(Shop.class);
+        if(pageWrap.getModel().getGoodsId()!=null){
+            //鏌ヨ鏌愬晢鍝佺殑渚涜揣浠�
+            queryWrapper.select("(select s.price from shop_goods_relation s where s.ISDELETED=0 and s.shop_id = t.id and s.GOODS_ID="+pageWrap.getModel().getGoodsId()+") as goodsPrice ");
+        }
         queryWrapper.selectAs(Labels::getName,Shop::getBigAreaName);
         queryWrapper.selectAs(Member::getNickname,Shop::getNickName);
         queryWrapper.selectAs(Member::getImgurl,Shop::getMemberImgurl);
@@ -364,7 +394,10 @@
         queryWrapper.eq(pageWrap.getModel().getSaleType()!=null, Shop::getSaleType, pageWrap.getModel().getSaleType());
         queryWrapper.eq(pageWrap.getModel().getStatus()!=null, Shop::getStatus, pageWrap.getModel().getStatus());
         queryWrapper.eq(pageWrap.getModel().getIsrec()!=null, Shop::getIsrec, pageWrap.getModel().getIsrec());
-        queryWrapper.orderByDesc(Shop::getCreateDate);
+        if(pageWrap.getModel().getGoodsId()!=null){
+            queryWrapper.orderByAsc("goodsPrice");
+        }
+        queryWrapper.orderByDesc(Shop::getId);
         IPage<Shop> result = shopJoinMapper.selectJoinPage(page, Shop.class, queryWrapper);
         String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
                 + systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHOP_FILE).getCode();
@@ -376,6 +409,25 @@
             }
 
         }
+        return PageData.from(result );
+    }
+    @Override
+    public   PageData<ShopMoneyVO>  findPageMoney(PageWrap<Shop> pageWrap){
+        IPage<Shop> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+        MPJLambdaWrapper<Shop> queryWrapper = new MPJLambdaWrapper<>();
+        Utils.MP.blankToNull(pageWrap.getModel());
+        queryWrapper
+                .selectAll(Shop.class)
+                .select("(select sum(price) from goodsorder g where  g.DISTRIBUTION_SHOP_ID=t.id and g.status in (1,2) and g.isdeleted=0) as jiesuanIng" )
+                .select("(select g.create_date from withdraw_record g where  g.MEMBER_ID=t.id  and g.isdeleted=0 order by g.id desc limit 1 ) as withdrawDate" )
+                .select("(select sum(g.amount)  from withdraw_record g where  g.MEMBER_ID=t.id and g.status=1  and g.isdeleted=0 ) as withdrawTotal"  )
+                .select("(select sum(g.amount)  from withdraw_record g where  g.MEMBER_ID=t.id and g.status=0 and g.isdeleted=0 ) as withdrawIng" );
+        queryWrapper.eq(Shop::getIsdeleted, Constants.ZERO);
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()) ,Shop::getCode,pageWrap.getModel().getCode());
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getUsername()) ,Shop::getName,pageWrap.getModel().getUsername());
+        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()) ,Shop::getName,pageWrap.getModel().getName());
+        queryWrapper.orderByDesc(Shop::getId);
+        IPage<ShopMoneyVO> result = shopJoinMapper.selectJoinPage(page, ShopMoneyVO.class, queryWrapper);
         return PageData.from(result );
     }
 
@@ -751,7 +803,7 @@
 
 
     @Override
-    public SaleReportResponse saleReport(SaleReportRequest request,String shopId){
+    public SaleReportResponse saleReport(SaleReportRequest request,Integer shopId){
         SaleReportResponse saleReportResponse = new SaleReportResponse();
         saleReportResponse.setSaleTotal(BigDecimal.ZERO);
         saleReportResponse.setOrderNum(Constants.ZERO);
@@ -762,7 +814,6 @@
                         .selectAll(Goodsorder.class)
                         .selectAs(Member::getPhone,Goodsorder::getPhone)
                         .selectAs(Member::getNickname,Goodsorder::getNickName)
-                        .select(" select ifnull(sum(g.SHOP_SETTLEMENT),0) from goodsorder_detail g where t.id = g.ORDER_ID   ",Goodsorder::getShopSettlement)
                         .leftJoin(Member.class,Member::getId,Goodsorder::getMemberId)
                         .eq(Goodsorder::getIsdeleted,Constants.ZERO)
                         .eq(Goodsorder::getDistributionShopId,shopId)
@@ -831,4 +882,44 @@
 
 
 
+    @Override
+    @Transactional
+    public  String setGoodsPrice(Shop dto){
+        // 鏌ヨ鐢ㄦ埛
+        Shop shop = shopMapper.selectById(dto.getId());
+        if (shop == null) {
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝渚涢攢鍟嗕俊鎭煡璇㈡棤鏁堬紒");
+        }
+        GoodsSku queryGoodsSku=new GoodsSku();
+        queryGoodsSku.setGoodsId(dto.getGoodsId());
+        queryGoodsSku.setIsdeleted(Constants.ZERO);
+        List<GoodsSku> goodsSkuList=goodsSkuMapper.selectList(new QueryWrapper<>(queryGoodsSku));
+        if(goodsSkuList==null || goodsSkuList.size() ==0){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇风‘璁ゅ晢鍝佷俊鎭湁鏁堜笖銆愰攢鍞环銆戝凡璁剧疆锛�");
+        }
+        //榛樿sku淇℃伅
+        GoodsSku goodsSku = goodsSkuList.get(0);
+        if(Constants.formatBigdecimal(goodsSku.getPrice()).compareTo(Constants.formatBigdecimal(dto.getGoodsPrice()))<=0){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝渚涜揣浠蜂笉鍏佽澶т簬鍟嗗搧閿�鍞环锛�");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        //鍏堝垹闄ゅ師鏉ョ殑鏁版嵁
+        shopGoodsRelationMapper.delete(new QueryWrapper<ShopGoodsRelation>().lambda()
+                .eq(ShopGoodsRelation::getGoodsId,dto.getGoodsId())
+                .eq(ShopGoodsRelation::getShopId,shop.getId())
+         );
+        ShopGoodsRelation add =new ShopGoodsRelation();
+        add.setCreator(user.getId());
+        add.setCreateDate(new Date());
+        add.setIsdeleted(Constants.ZERO);
+        add.setEditor(add.getCreator());
+        add.setEditDate(add.getCreateDate());
+        add.setShopId(dto.getId());
+        add.setGoodsId(dto.getGoodsId());
+        add.setGoodsSkuId(goodsSku.getId());
+        add.setPrice(dto.getGoodsPrice());
+        add.setStatus(Constants.ZERO);
+        shopGoodsRelationMapper.insert(add);
+        return "鎿嶄綔鎴愬姛";
+    }
 }

--
Gitblit v1.9.3