Merge remote-tracking branch 'origin/master'

doum

2026-01-13 f4e09a3f13bbf63b166c3a149497a93a9fd43bc5

Merge remote-tracking branch 'origin/master'

 server/dmmall_admin/src/main/java/com/doumee/api/business/ShopGoodsRelationController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
package com.doumee.api.business;

import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.ShopGoodsRelation;
import com.doumee.service.business.ShopGoodsRelationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;    
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;

import java.util.ArrayList;
import java.util.List;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2025/12/15 09:39
 */
@Api(tags = "经销商供货价信息")
@RestController
@RequestMapping("/business/shopGoodsRelation")
public class ShopGoodsRelationController extends BaseController {

    @Autowired
    private ShopGoodsRelationService shopGoodsRelationService;

    @PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:shopgoodsrelation:create")
    public ApiResponse create(@RequestBody ShopGoodsRelation shopGoodsRelation) {
        return ApiResponse.success(shopGoodsRelationService.create(shopGoodsRelation));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:shopgoodsrelation:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        shopGoodsRelationService.deleteById(id);
        return ApiResponse.success(null);
    }

    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @RequiresPermissions("business:shopgoodsrelation:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
            idList.add(Integer.valueOf(id));
        }
        shopGoodsRelationService.deleteByIdInBatch(idList);
        return ApiResponse.success(null);
    }

    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @RequiresPermissions("business:shopgoodsrelation:update")
    public ApiResponse updateById(@RequestBody ShopGoodsRelation shopGoodsRelation) {
        shopGoodsRelationService.updateById(shopGoodsRelation);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:shopgoodsrelation:query")
    public ApiResponse<PageData<ShopGoodsRelation>> findPage (@RequestBody PageWrap<ShopGoodsRelation> pageWrap) {
        return ApiResponse.success(shopGoodsRelationService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:shopgoodsrelation:exportExcel")
    public void exportExcel (@RequestBody PageWrap<ShopGoodsRelation> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(ShopGoodsRelation.class).export(shopGoodsRelationService.findPage(pageWrap).getRecords(), "经销商供货价信息", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:shopgoodsrelation:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(shopGoodsRelationService.findById(id));
    }
}

 server/dmmall_service/db/business.shop_goods_relation.permissions.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,6 @@
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:shopgoodsrelation:create', '新建经销商供货价信息', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:shopgoodsrelation:delete', '删除经销商供货价信息', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:shopgoodsrelation:update', '修改经销商供货价信息', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:shopgoodsrelation:query', '查询经销商供货价信息', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);
INSERT INTO `SYSTEM_PERMISSION`(`CODE`, `NAME`, `REMARK`, `FIXED`, `CREATE_USER`, `CREATE_TIME`, `UPDATE_USER`, `UPDATE_TIME`, `DELETED`) VALUES ('business:shopgoodsrelation:exportExcel', '导出经销商供货价信息(Excel)', '', 0, 1, CURRENT_TIMESTAMP, NULL, NULL, 0);


 server/dmmall_service/src/main/java/com/doumee/core/constants/ResponseStatus.java

@@ -13,7 +13,7 @@
public enum ResponseStatus {
    // 400开头表示参数错误
    BAD_REQUEST(4000, "参数错误"),
    DATA_EMPTY(4001, "找不到目标数据"),
    DATA_EMPTY(4001, "找不到目标数据或数据已删除"),
    DATA_EXISTS(4002, "记录已存在"),
    PWD_INCORRECT(4003, "密码不正确"),
    VERIFICATION_CODE_INCORRECT(4004, "验证码不正确或已过期"),

 server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -57,6 +57,14 @@
    public static final String INITIAL_PASSWORD = "INITIAL_PASSWORD";
    public static final String ACCESS_TOKEN = "ACCESS_TOKEN";

    public static final String MINIMUM_AVAILABLE_INTEGRAL = "MINIMUM_AVAILABLE_INTEGRAL";//最低可用积分配置
    public static final String SHOP_CONFIG = "SHOP_CONFIG";
    public static final String INTEGRAL_EXCHANGE_CASH_RATA = "INTEGRAL_EXCHANGE_CASH_RATA"; //积分-现金兑换比例（XXX积分抵扣1元）


    public static final String CASH_EXCHANGE_INTEGRAL_RATA = "CASH_EXCHANGE_INTEGRAL_RATA";//现金-积分兑换比例（1元可得到XXX积分）


    public static final String INITIAL_ROLE = "INITIAL_ROLE";

    public static final String PLAT_ADDR="PLAT_ADDR";
@@ -568,7 +576,7 @@
     */
    public  enum OrderStatus{
        WAIT_PAY(0, "待支付", "待支付"),
        PAY_DONE(1, "待发货", "已支付待发货"),
        PAY_DONE(1, "待发货/待自提", "已支付待发货/待自提"),
        WAIT_RECEIVE(2, "待收货", "已发货待收货"),
        DONE(3, "交易完成", "交易完成"),
        CLOSE(4, "已关闭", "已关闭"),
@@ -844,7 +852,10 @@
        EXCHANGE_CARD(11,"卡充值","卡充值",0),
        SYSTEM_RECHARGE(12,"平台充值","平台充值",0),
        SYSTEM_DEDUCT(13,"平台扣款","平台扣款",0),
        SHOP_ORDER_CANCEL(14,"余额抵扣商品退还","余额抵扣商品退还",0)
        SHOP_ORDER_CANCEL(14,"余额抵扣商品退还","余额抵扣商品退还",0),
        SHOP_ORDER_SETTLEMENT(15,"下单结算金额","下单结算金额",0), //经销商下单结算金额
        SHOP_ORDER_CANCEL_SETTLEMENT(16,"取消订单结算金额返还","取消订单结算金额返还",0), //取消订单结算金额返还
        SHOP_YEAR_SETTLEMENT(17,"年度结算","年度结算",0) //年度结算
        ;
        // æˆå‘˜å˜é‡
        private String name;
@@ -1056,4 +1067,67 @@
        }

    }


    public static String getRandomNumber(){
        Random random = new Random();
        long randomNumber = (long)(random.nextDouble() * 90000000000L) + 100000000000L;
        return randomNumber +"";
    }


    public  enum INTEGRAL_TYPE{
        ORDER_PAY(0, "订单消耗", -1),
        ORDER_CANCEL(1, "订单取消返还", 1),
        ;
        // æˆå‘˜å˜é‡
        private String name;
        private int key;
        private int type;// æè¿°

        // æž„造方法
        INTEGRAL_TYPE(int key, String name, int type) {
            this.name = name;
            this.key = key;
            this.type = type;
        }

        // æ™®é€šæ–¹æ³•
        public static String getName(int index) {
            for (INTEGRAL_TYPE c : INTEGRAL_TYPE.values()) {
                if (c.getKey() == index) {
                    return c.name;
                }
            }
            return null;
        }


        // get set æ–¹æ³•
        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public int getKey() {
            return key;
        }

        public void setKey(int key) {
            this.key = key;
        }

        public int getType() {
            return type;
        }

        public void setType(int type) {
            this.type = type;
        }
    }


}

 server/dmmall_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -1907,7 +1907,7 @@
     */
    public static String getCurrDateTime() {
        Timestamp date = new Timestamp(System.currentTimeMillis());
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        return formatter.format(date);
    }


 server/dmmall_service/src/main/java/com/doumee/core/utils/ListUtil.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.doumee.core.utils;

import org.springframework.beans.BeanUtils;

import java.util.List;
import java.util.function.Supplier;
import java.util.stream.Collectors;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/12/12 9:31
 */
public class ListUtil {

    public static <S, T> List<T> copyProperties(List<S> sources, Supplier<T> target) {
        return sources.stream().map(source -> {
            T t = target.get();
            BeanUtils.copyProperties(source, t);
            return t;
        }).collect(Collectors.toList());
    }

    public static <S, T> List<T> copyListProperties(List<S> sources, Class<T> target) {
        return sources.stream().map(source -> {
            T t;
            try {
                t = target.newInstance();
            } catch (Exception e) {
                e.printStackTrace();
                return null;
            }
            BeanUtils.copyProperties(source, t);
            return t;
        }).collect(Collectors.toList());
    }

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsMapper.java

@@ -7,6 +7,7 @@
import com.doumee.dao.business.model.Goods;
import com.doumee.dao.web.request.goods.GoodsRequest;
import com.doumee.dao.web.response.goods.GoodsInfoResponse;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

@@ -14,18 +15,21 @@
 * @author æ±Ÿè¹„蹄
 * @date 2023/03/21 15:48
 */
public interface GoodsMapper extends BaseMapper<Goods> {
public interface GoodsMapper extends MPJJoinMapper<Goods> {



    @Select(" select g.* , " +
            "(( select count(1) from goodsorder_detail gd inner join goods_sku gs on gd.GOODS_SKU_ID = gs.id where gs.GOODS_ID = g.`id`  )+ g.SALENUM) as realSaleNum   " +
            "(( select count(1) from goodsorder_detail gd inner join goods_sku gs on gd.GOODS_SKU_ID = gs.id where gs.GOODS_ID = g.`id`  )+ g.SALENUM) as realSaleNum ," +
            " ifnull(( select min(gs.PRICE) from goods_sku gs where gs.GOODS_ID = g.id ),0) as minPrice  " +
            " from goods g  " +
            " ${ew.customSqlSegment} ")
    IPage<GoodsInfoResponse> goodsPage(IPage<GoodsRequest> page, @Param(Constants.WRAPPER) Wrapper wrapper);


    @Select(" select g.* ,  ( select count(1) from goodsorder_detail gd inner join goods_sku gs on gd.GOODS_SKU_ID = gs.id where gs.GOODS_ID = g.id  ) as realSaleNum    " +
    @Select(" select g.* , " +
            "(( select count(1) from goodsorder_detail gd inner join goods_sku gs on gd.GOODS_SKU_ID = gs.id where gs.GOODS_ID = g.`id`  )+ g.SALENUM) as realSaleNum ," +
            " ifnull(( select min(gs.PRICE) from goods_sku gs where gs.GOODS_ID = g.id ),0) as minPrice  " +
            " from goods g  " +
            "  where g.ISDELETED = 0 and g.id = #{id} ")
    GoodsInfoResponse getGoodsInfo(@Param("id") Integer id);

 server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderDetailMapper.java

@@ -8,6 +8,7 @@
import com.doumee.dao.web.response.OrderCommentResponse;
import com.doumee.dao.web.response.OrderDetailResponse;
import com.doumee.dao.web.response.goods.MemberOrderDetailResponse;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

@@ -17,7 +18,7 @@
 * @author æ±Ÿè¹„蹄
 * @date 2023/03/21 15:48
 */
public interface GoodsorderDetailMapper extends BaseMapper<GoodsorderDetail> {
public interface GoodsorderDetailMapper extends MPJJoinMapper<GoodsorderDetail> {


    @Select(" select o.* , g.STATUS , g.PRICE as titlePrice   " +

 server/dmmall_service/src/main/java/com/doumee/dao/business/GoodsorderMapper.java

@@ -23,18 +23,18 @@

    @Select(" select g.CODE AS code ,  g.id as orderId , g.CREATE_DATE as createDate    , g.TYPE as orderType , g.STATUS as orderStatus , g.IS_COMMENT as isComment , g.PAY_STATUS as  payStatus ," +
            " g.COUPON_PRICE as couponPrice , g.price , g.LINKNAME  as linkName , g.LINKPHONE as linkPhone , g.LINKADDR as linkAddress , " +
            "g.KD_DATE as kdDate , g.KD_NAME as kdName  , g.KD_CODE as kdCode , g.integral , SUBDATE(g.CREATE_DATE,interval - 15 minute) as cancelDate , g.PAY_DATE AS payDate , g.DONE_DATE as doneDate " +
            " , g.MEMBER_INFO  " +
            " from goodsorder g  " +
            "g.KD_DATE as kdDate , g.KD_NAME as kdName  , g.KD_CODE as kdCode , g.INTEGRAL_PRICE as integral , SUBDATE(g.CREATE_DATE,interval - 15 minute) as cancelDate , g.PAY_DATE AS payDate , g.DONE_DATE as doneDate " +
            " , g.MEMBER_INFO , g.RECEIVE_TYPE as receiveType, s.name as shopName ,s.id as shopId ,g.exchange_code as exchangeCode  " +
            " from goodsorder g left join shop s on g.PICK_UP_SHOP_ID = s.id   " +
            " ${ew.customSqlSegment} ")
    IPage<MemberOrderResponse> goodsOrderPage(IPage<MemberOrderResponse> page, @Param(Constants.WRAPPER) Wrapper wrapper);


    @Select(" select g.CODE AS code ,  g.id as orderId , g.CREATE_DATE as createDate    , g.TYPE as orderType , g.STATUS as orderStatus , g.IS_COMMENT as isComment , g.PAY_STATUS as  payStatus ," +
            " g.COUPON_PRICE as couponPrice , g.price , g.LINKNAME  as linkName , g.LINKPHONE as linkPhone , g.LINKADDR as linkAddress , " +
            "g.KD_DATE as kdDate , g.KD_NAME as kdName  , g.KD_CODE as kdCode , g.integral , SUBDATE(g.CREATE_DATE,interval - 15 minute) as cancelDate , g.PAY_DATE AS payDate , g.DONE_DATE as doneDate " +
            " , g.MEMBER_INFO  " +
            " from goodsorder g  " +
            "g.KD_DATE as kdDate , g.KD_NAME as kdName  , g.KD_CODE as kdCode , g.INTEGRAL_PRICE as integral , SUBDATE(g.CREATE_DATE,interval - 15 minute) as cancelDate , g.PAY_DATE AS payDate , g.DONE_DATE as doneDate " +
            " , g.MEMBER_INFO , g.RECEIVE_TYPE as receiveType, s.name as shopName ,s.id as shopId,g.exchange_code as exchangeCode " +
            " from goodsorder g left join shop s on g.PICK_UP_SHOP_ID = s.id   " +
            " where g.id = #{id} ")
    MemberOrderResponse goodsOrderDetail(@Param("id") Integer id);


 server/dmmall_service/src/main/java/com/doumee/dao/business/MemberCouponMapper.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.response.MemberCouponResponse;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

@@ -19,7 +20,6 @@
    @Select(" select m.*   " +
            " from member_coupon m  " +
            " ${ew.customSqlSegment} ")
    IPage<CouponDTO> memberCouponPage(IPage<CouponDTO> page, @Param(Constants.WRAPPER) Wrapper wrapper);

    IPage<MemberCouponResponse> memberCouponPage(IPage<CouponDTO> page, @Param(Constants.WRAPPER) Wrapper wrapper);

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/ShopGoodsRelationMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.ShopGoodsRelation;

/**
 * @author æ±Ÿè¹„蹄
 * @date 2025/12/15 09:39
 */
public interface ShopGoodsRelationMapper extends BaseMapper<ShopGoodsRelation> {

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/ShopMapper.java

@@ -2,6 +2,10 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.doumee.dao.business.model.Shop;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

import java.math.BigDecimal;

/**
 * @author æ±Ÿè¹„蹄
@@ -9,4 +13,23 @@
 */
public interface ShopMapper extends BaseMapper<Shop> {


    /**
     * æ·»åŠ ç§¯åˆ†
     * @param memberId
     * @param integral
     */
    @Select(" update shop set INTEGRAL = ifNull( INTEGRAL,0) + #{integral} , TOTAL_INTEGRAL = ifNull(TOTAL_INTEGRAL,0) +  #{titleIntegral}   , EDIT_DATE = now()  where id = #{shopId}  ")
    void addIntegral(@Param("shopId") Integer shopId , @Param("integral") BigDecimal integral , @Param("titleIntegral")BigDecimal titleIntegral);

    /**
     * å‡å°‘积分
     * @param memberId
     * @param integral
     */
    @Select(" update shop set INTEGRAL = ifNull( INTEGRAL,0) - #{integral} , EDIT_DATE = now()   where id = #{shopId}  ")
    void subtractIntegral(@Param("shopId") Integer shopId , @Param("integral")BigDecimal integral);



}

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goods.java

@@ -126,13 +126,15 @@
    @ExcelColumn(name="一级分类")
    private String parentCategoryId;

    @ApiModelProperty(value = "抵扣比例（0.1%~100%）", example = "1")
    @ApiModelProperty(value = "抵扣比例（0.1%~100%）", example = "1", hidden = true)
    @TableField(exist = false)
    private BigDecimal deductRata;


    @ApiModelProperty(value = "sku重量", hidden = true)
    @TableField(exist = false)
    private BigDecimal weight;

    @ApiModelProperty(value = "sku金额", hidden = true)
    @TableField(exist = false)
    private BigDecimal skuPrice;
@@ -148,6 +150,10 @@
    @TableField(exist = false)
    private Integer skuId;

    @ApiModelProperty(value = "sku图片", hidden = true)
    @TableField(exist = false)
    private String skuImg;

    @ApiModelProperty(value = "商品轮播图", example = "1")
    @TableField(exist = false)
    private List<Multifile> fileList;

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -58,6 +59,9 @@
    @ApiModelProperty(value = "收货地址")
    @ExcelColumn(name="联系人地址" ,index =8 ,width = 10)
    private String linkaddr;

    @ApiModelProperty(value = "订单总价格", example = "1")
    private BigDecimal totalPrice;

    @ApiModelProperty(value = "订单实付价格（元/咖豆）", example = "1")
    @ExcelColumn(name="订单实付价格",index =9,width = 10)
@@ -173,10 +177,28 @@
    @ApiModelProperty(value = "优惠券编码（关联MEMBER_COUPON表）", example = "1")
    private Integer couponId;


    @ApiModelProperty(value = "积分抵扣金额", example = "1")
    private BigDecimal integralPrice;

    @ApiModelProperty(value = "消耗积分值", example = "1")
    private BigDecimal useIntegral;


    @ApiModelProperty(value = "咖啡计划订单形式 0新增 1延长", example = "1")
    private Integer planOrderType;

    @ApiModelProperty(value = "收货类型：0=快递配送；1=门店自提；", example = "1")
    private Integer receiveType;

    @ApiModelProperty(value = "提货商铺主键 shop：id", example = "1")
    private Integer pickUpShopId;

    @ApiModelProperty(value = "分销商铺主键 shop：id", example = "1")
    private Integer distributionShopId;

    @ApiModelProperty(value = "核销码", example = "1")
    private String exchangeCode;

    @ApiModelProperty(value = "文件地址")
    @TableField(exist = false)

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/GoodsorderDetail.java

@@ -84,12 +84,26 @@





    @ApiModelProperty(value = "商品数量", example = "1")
    @ExcelColumn(name="商品数量")
    private Integer goodsNum;

    @ApiModelProperty(value = "商品重量", example = "1")
    @ExcelColumn(name="商品重量")
    private BigDecimal goodsWeight;

    @ApiModelProperty(value = "优惠券抵扣金额", example = "1")
    private BigDecimal couponDeduct;

    @ApiModelProperty(value = "积分抵扣金额", example = "1")
    private BigDecimal integralDeduct;

    @ApiModelProperty(value = "经销商结算金额", example = "1")
    private BigDecimal shopSettlement;




    @ApiModelProperty(value = "商品标签名称")
    @TableField(exist = false)
    private String lablesName;

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Integral.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -76,6 +77,8 @@
    @ApiModelProperty(value = "交易单号")
    private String orderCode;

    @ApiModelProperty(value = "用户类型：0=消费者；1=经销商；")
    private Integer userType;

    @ApiModelProperty(value = "用户昵称")
    @ExcelColumn(name="用户",index =1,width = 10)
@@ -109,4 +112,19 @@
    private String strObjType;



//    public static  Integral createIntegral(Integer memberId, Constants.INTEGRAL_TYPE integralType,Integer objId){
//        Integral integral = new Integral();
//        integral.setCreator(memberId);
//        integral.setCreateDate(new Date());
//        integral.setIsdeleted(Constants.ZERO);
//        integral.setMemberId(memberId);
//        integral.setTitle(integralType.getName());
//        integral.setObjId(objId);
//        integral.setObjType(integralType.getKey());
//        integral.setType(integralType.getType());
//
//        return integral;
//    }

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Member.java

@@ -149,6 +149,9 @@
    @ExcelColumn(name="sharingCode")
    private String sharingCode;

    @ApiModelProperty(value = "绑定商铺主键 shop:id åˆ†é”€äºº")
    private Integer bindShopId;

    @ApiModelProperty(value = "文件地址全路径")
    @TableField(exist = false)
    private String imgFullUrl;

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java

@@ -101,7 +101,6 @@

    @ApiModelProperty(value = "使用时间")
    @ExcelColumn(name="使用时间")
    
    private Date useDate;

    @ApiModelProperty(value = "使用积分奖励数量", example = "1")
@@ -116,9 +115,24 @@
    @ExcelColumn(name="coupon表id")
    private Integer couponId;

    @ApiModelProperty(value = "优惠券类型：0=满减券；1=折扣券；")
    private Integer couponType;

    @ApiModelProperty(value = "适用类型：0=全场;1=品类；2=指定商品")
    private Integer applyType;

    @ApiModelProperty(value = "适用关联对象信息主键")
    private String applyIds;

    @ApiModelProperty(value = "折扣卷满减上限金额")
    private BigDecimal maxPrice;

    @ApiModelProperty(value = "昵称")
    @TableField(exist = false)
    private String nikeName;

    @ApiModelProperty(value = "实际适用时金额")
    @TableField(exist = false)
    private BigDecimal validAmount;

}

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Shop.java

@@ -206,6 +206,10 @@
    @TableField(exist = false)
    private BigDecimal score;

    @ApiModelProperty(value = "距离")
    @TableField(exist = false)
    private BigDecimal distance;


    @ApiModelProperty(value = "店铺访问数据：主页总访问量")
    @TableField(exist = false)

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/ShopGoodsRelation.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,72 @@
package com.doumee.dao.business.model;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;

/**
 * ç»é”€å•†ä¾›è´§ä»·ä¿¡æ¯
 * @author æ±Ÿè¹„蹄
 * @date 2025/12/15 09:39
 */
@Data
@ApiModel("经销商供货价信息")
@TableName("`shop_goods_relation`")
public class ShopGoodsRelation {

    @TableId(type = IdType.AUTO)
    @ApiModelProperty(value = "主键", example = "1")
    @ExcelColumn(name="主键")
    private Integer id;

    @ApiModelProperty(value = "创建人编码", example = "1")
    @ExcelColumn(name="创建人编码")
    private Integer creator;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "更新人编码", example = "1")
    @ExcelColumn(name="更新人编码")
    private Integer editor;

    @ApiModelProperty(value = "更新时间")
    @ExcelColumn(name="更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    @ExcelColumn(name="是否删除0否 1是")
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "商户主键（shop主键）", example = "1")
    @ExcelColumn(name="商户主键（shop主键）")
    private Integer shopId;

    @ApiModelProperty(value = "商品SKU ID（goods_sku主键）", example = "1")
    @ExcelColumn(name="商品SKU ID（goods_sku主键）")
    private Integer goodsSkuId;

    @ApiModelProperty(value = "供货价", example = "1")
    @ExcelColumn(name="供货价")
    private BigDecimal price;

    @ApiModelProperty(value = "启用0 ç¦ç”¨1", example = "1")
    @ExcelColumn(name="启用0 ç¦ç”¨1")
    private Integer status;


}

 server/dmmall_service/src/main/java/com/doumee/dao/web/dto/CouponDTO.java

@@ -66,4 +66,18 @@

    @ApiModelProperty(value = "优惠券状态")
    private String couponStatus;

    @ApiModelProperty(value = "优惠券类型：0=满减券；1=折扣券；")
    private Integer couponType;

    @ApiModelProperty(value = "适用类型：0=全场;1=品类；2=指定商品")
    private Integer applyType;

    @ApiModelProperty(value = "适用关联对象信息主键")
    private String applyIds;

    @ApiModelProperty(value = "折扣卷满减上限金额")
    private BigDecimal maxPrice;


}

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/DealIntegralRequest.java

@@ -34,4 +34,7 @@

    @ApiModelProperty(value = "收支类型 0收入 1支出")
    private Integer dealType;



}

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/OrderCancelRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
package com.doumee.dao.web.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/3/23 9:50
 */
@Data
@ApiModel("订单取消请求类")
public class OrderCancelRequest {

    @ApiModelProperty(value = "订单主键",example = "0")
    private Integer orderId;

    @ApiModelProperty(value = "取消原因")
    private String cancelInfo;

    @ApiModelProperty(value = "用户主键",hidden = true)
    private Integer memberId;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/OrderPayRequest.java

@@ -51,6 +51,7 @@
    private BigDecimal deductionBalance;


    @ApiModelProperty(hidden = true)
    private Integer memberId ;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/PayDetailRequest.java

@@ -27,5 +27,7 @@
    @ApiModelProperty(value = "购物车商品主键")
    private Integer shopCartId;

    @ApiModelProperty(value = "优惠券抵扣金额",hidden = true)
    private BigDecimal deductAmount;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/ShopOrderPayRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
package com.doumee.dao.web.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/3/24 15:32
 */
@Data
@ApiModel("商品下单请求类")
public class ShopOrderPayRequest {

    @ApiModelProperty(value = "收货地址主键")
    private Integer addressId;

    @NotNull(message = "订单总金额 ä¸èƒ½ä¸ºç©º")
    @ApiModelProperty(value = "订单总金额")
    private BigDecimal titlePrice;

    @ApiModelProperty(value = "收货类型：0=快递配送；1=门店自提；")
    private Integer receiveType;

    @ApiModelProperty(value = "自提商户主键")
    private Integer shopId;

    @ApiModelProperty(value = "支付商品详细")
    List<PayDetailRequest> payDetailRequestList;

    @ApiModelProperty(value = "订单备注")
    private String remark;

    @ApiModelProperty(hidden = true)
    private Integer memberId ;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/UpdMobileRequest.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,29 @@
package com.doumee.dao.web.request;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.io.Serializable;
import java.util.List;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/3/23 9:50
 */
@Data
@ApiModel("手机换绑请求类")
public class UpdMobileRequest {

    @ApiModelProperty(value = "验证码",example = "0")
    private String code;

    @ApiModelProperty(value = "手机号")
    private String phone;

    @ApiModelProperty(value = "用户主键",hidden = true)
    private Integer memberId;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/DealOrderRequest.java

@@ -17,6 +17,9 @@
    @ApiModelProperty(value = "订单主键")
    private Integer orderId;

    @ApiModelProperty(value = "订单核销码")
    private String exchangeCode;

    @ApiModelProperty(value = "收货地址主键（更新订单收货地址使用）")
    private Integer addressId;

@@ -26,6 +29,7 @@
    @ApiModelProperty(value = "订单评价信息（订单评价业务使用）")
    private String  commentInfo;

    @ApiModelProperty(hidden = true)
    private Integer memberId;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/GoodsRequest.java

@@ -28,6 +28,19 @@
    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "适用品牌 lables 14")
    private Integer applicableBrandId;

    @ApiModelProperty(value = "适用系列 lables 15")
    private Integer seriesBrandId;

    @ApiModelProperty(value = "品质专区主键")
    private Integer qualityId;

    @ApiModelProperty(value = "排序方式：0=综合排序；1=销量由低到高 ï¼›2=价格由低到高；3=销量由高到低；4=价格由高到低")
    private Integer sortInfo;


    @ApiModelProperty(value = "一级分类编码")
    private Integer parentCategoryId;


 server/dmmall_service/src/main/java/com/doumee/dao/web/request/goods/MemberOrderRequest.java

@@ -23,7 +23,7 @@
    @ApiModelProperty(value = "订单类型 0平台商城 1咖豆商城", example = "1")
    private Integer orderType;

    @ApiModelProperty(value = "状态 0待支付 1待发货 2待收货 3交易完成", example = "1")
    @ApiModelProperty(value = "状态 0待支付 1待发货/自提 2待收货 3交易完成", example = "1")
    private Integer orderStatus;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/HomeInfoResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,36 @@
package com.doumee.dao.web.response;

import com.doumee.dao.business.model.Member;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.math3.analysis.function.Log;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/12/15 14:46
 */
@Data
public class HomeInfoResponse {

    @ApiModelProperty(value = "用户信息")
    private Member member;

    @ApiModelProperty(value = "购物车商品种类")
    private Long cartTypeNum;

    @ApiModelProperty(value = "优惠券数量")
    private Long couponNum;

    @ApiModelProperty(value = "收藏数量")
    private Long collectNum;

    @ApiModelProperty(value = "待付款数量")
    private Long waitPayNum;

    @ApiModelProperty(value = "待收货数量")
    private Long waitReceiveNum;


}

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/MemberCouponResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,85 @@
package com.doumee.dao.web.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@Data
@ApiModel("用户优惠券信息")
public class MemberCouponResponse {


    @ApiModelProperty(value = "id")
    private Integer id;

    @ApiModelProperty(value = "优惠券名称")
    private String name;

    @ApiModelProperty(value = "备注")
    private String remark;

    @ApiModelProperty(value = "商家编码（关联shop表）")
    private Integer shopId;

    @ApiModelProperty(value = "类型0商家优惠券 1平台优惠券 ")
    private Integer type;

    @ApiModelProperty(value = "满额（元）")
    private BigDecimal limitPrice;

    @ApiModelProperty(value = "优惠金额（元）")
    private BigDecimal price;

    @ApiModelProperty(value = "开始时间")
    private Date startDate;

    @ApiModelProperty(value = "结束时间")
    private Date endDate;

    @ApiModelProperty(value = "领取后有效天数")
    private Integer validDays;

    @ApiModelProperty(value = "领取方式 0领取 1兑换")
    private Integer getMethod;

    @ApiModelProperty(value = "兑换所需咖豆金额")
    private BigDecimal integral;

    @ApiModelProperty(value = "状态 0启用 1禁用")
    private Integer status;

    @ApiModelProperty(value = "发放总量")
    private Integer num;

    @ApiModelProperty(value = "领取总量")
    private Integer drawNum;

    @ApiModelProperty(value = "说明")
    private String info;

    @ApiModelProperty(value = "领取状态 ")
    private String drawStatus;

    @ApiModelProperty(value = "优惠券状态")
    private String couponStatus;

    @ApiModelProperty(value = "优惠券类型：0=满减券；1=折扣券；")
    private Integer couponType;

    @ApiModelProperty(value = "适用类型：0=全场;1=品类；2=指定商品")
    private Integer applyType;

    @ApiModelProperty(value = "适用关联对象信息主键")
    private String applyIds;

    @ApiModelProperty(value = "折扣卷满减上限金额")
    private BigDecimal maxPrice;

    @ApiModelProperty(value = "适用关联对象信息")
    private List<String> relationInfoList;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/PayDetailResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
package com.doumee.dao.web.response;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2023/3/24 15:32
 */
@Data
@ApiModel("订单确认返回类")
public class PayDetailResponse {

    @ApiModelProperty(value = "sku组合编码（关联goods_sku表）")
    private Integer goodsSkuId;

    @ApiModelProperty(value = "商品数量")
    private Integer goodsNum;

    @ApiModelProperty(value = "商品数量")
    private String skuImg;

    @ApiModelProperty(value = "商品名称")
    private String goodsName;

    @ApiModelProperty(value = "购物车商品主键")
    private Integer shopCartId;

    @ApiModelProperty(value = "优惠券抵扣金额",hidden = true)
    private BigDecimal deductAmount;

}

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/GoodsInfoResponse.java

@@ -49,8 +49,11 @@
    @ApiModelProperty(value = "品牌")
    private Labels brandLabels;

    @ApiModelProperty(value = "展示价格")
    @ApiModelProperty(value = "展示价格（划线价）")
    private BigDecimal price;

    @ApiModelProperty(value = "最低价")
    private BigDecimal minPrice;

    @ApiModelProperty(value = "商品详情")
    private String content;
@@ -76,6 +79,9 @@
    @ApiModelProperty(value = "排序码")
    private Integer sortnum;

    @ApiModelProperty(value = "真实库存")
    private Integer stock;

//    @ApiModelProperty(value = "商品标签")
//    private List<Labels> labelsList;


 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/MemberOrderResponse.java

@@ -1,5 +1,7 @@
package com.doumee.dao.web.response.goods;

import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.business.model.Shop;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -33,7 +35,16 @@
    @ApiModelProperty(value = "订单类型 0平台商城 1咖豆商城 2咖啡计划编码", example = "1")
    private Integer orderType;

    @ApiModelProperty(value = "状态 0待支付 1待发货 2待收货 3交易完成 4已关闭 5部分发货", example = "1")
    @ApiModelProperty(value = "收货类型：0=快递配送；1=门店自提；", example = "1")
    private Integer receiveType;

    @ApiModelProperty(value = "自提经销商主键", example = "1")
    private Integer shopId;

    @ApiModelProperty(value = "经销商名称", example = "1")
    private String shopName;

    @ApiModelProperty(value = "状态 0待支付 1待发货/待自提 2待收货 3交易完成 4已关闭 5部分发货", example = "1")
    private Integer orderStatus;

    @ApiModelProperty(value = "是否已评价 0未评价 1已评价", example = "1")
@@ -72,6 +83,8 @@
    @ApiModelProperty(value = "完成时间", example = "1")
    private Date doneDate;

    @ApiModelProperty(value = "核销码", example = "1")
    private String exchangeCode;

    @ApiModelProperty(value = "抵扣金额", example = "1")
    private BigDecimal integral;
@@ -86,4 +99,13 @@
    @ApiModelProperty(value = "订单明细信息", example = "1")
    private List<MemberOrderDetailResponse> memberOrderDetailResponseList;


    @ApiModelProperty(value = "经销商信息", example = "1")
    private Shop shopInfo;

    @ApiModelProperty(value = "优惠券信息", example = "1")
    private MemberCoupon memberCoupon;



}

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderGoodsCalculateResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
package com.doumee.dao.web.response.goods;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.dao.business.model.GoodsSku;
import com.doumee.dao.business.model.Multifile;
import com.doumee.dao.business.model.Sku;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.xpath.operations.Bool;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * å•†å“ä¿¡æ¯è¡¨
 * @author æ±Ÿè¹„蹄
 * @date 2023/03/21 15:48
 */
@Data
public class OrderGoodsCalculateResponse {

    @ApiModelProperty(value = "主键", example = "1")
    private Integer id;

    @ApiModelProperty(value = "是否删除0否 1是", example = "1")
    private Integer isdeleted;

    @ApiModelProperty(value = "名称")
    private String name;

    @ApiModelProperty(value = "分类编码（关联labels表）", example = "1")
    private Integer categoryId;

    @ApiModelProperty(value = "品牌编码（关联labels表）", example = "1")
    private Integer brandId;

    @ApiModelProperty(value = "抵扣比例（0.1%~100%）", example = "1")
    private BigDecimal deductRata;

    @ApiModelProperty(value = "商品数量")
    private Integer goodsNum;

    @ApiModelProperty(value = "单个商品重量(kg)", example = "1")
    private BigDecimal weight;

    @ApiModelProperty(value = "sku金额")
    private BigDecimal skuPrice;

    @ApiModelProperty(value = "sku总金额")
    private BigDecimal skuAmount;

    @ApiModelProperty(value = "skuId")
    private Integer skuId;

    @ApiModelProperty(value = "订单中优惠券金额占比", hidden = true)
    private BigDecimal orderCouponRata;

    @ApiModelProperty(value = "优惠券抵扣金额", hidden = true)
    private BigDecimal couponDeductCash;

    @ApiModelProperty(value = "是否可以使用优惠券", hidden = true)
    private Boolean useCoupon;

    @ApiModelProperty(value = "积分最大可抵扣金额", hidden = true)
    private BigDecimal integralMaxDeductCash;

    @ApiModelProperty(value = "积分实际抵扣金额", hidden = true)
    private BigDecimal integralDeductCash;

    @ApiModelProperty(value = "实际使用积分", hidden = true)
    private BigDecimal integralDeduct;

    @ApiModelProperty(value = "订单中积分金额实际占比", hidden = true)
    private BigDecimal orderIntegralRata;

    @ApiModelProperty(value = "库存量")
    private BigDecimal stockNum;

    @ApiModelProperty(value = "实际销量")
    private BigDecimal  salesVolume;



}

 server/dmmall_service/src/main/java/com/doumee/dao/web/response/goods/OrderPayConfirmResponse.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
package com.doumee.dao.web.response.goods;

import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.web.request.PayDetailRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
 * å•†å“SKU规格组信息表
 * @author æ±Ÿè¹„蹄
 * @date 2023/03/21 15:48
 */
@Data
@ApiModel("商品确认页信息响应类")
public class OrderPayConfirmResponse {

    @ApiModelProperty(value = "订单总金额", example = "1")
    private BigDecimal amount;

    @ApiModelProperty(value = "优惠券抵扣金额", example = "1")
    private BigDecimal couponAmount;

    @ApiModelProperty(value = "积分抵扣金额", example = "1")
    private BigDecimal integralAmount;

    @ApiModelProperty(value = "抵扣积分值", example = "1")
    private BigDecimal deductIntegral;

    @ApiModelProperty(value = "邮费金额", example = "1")
    private BigDecimal mailAmount;

    @ApiModelProperty(value = "支付金额", example = "1")
    private BigDecimal payAmount;

    @ApiModelProperty(value = "下单返积分", example = "1")
    private BigDecimal integralBack;

    @ApiModelProperty(value = "优惠券信息", example = "1")
    private MemberCoupon memberCoupon;

    @ApiModelProperty(value = "商品信息", example = "1")
    private List<OrderGoodsCalculateResponse> goodsCalculateList;




}

 server/dmmall_service/src/main/java/com/doumee/service/business/GoodsorderService.java

@@ -4,14 +4,21 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.request.OrderCancelRequest;
import com.doumee.dao.web.request.OrderPayRequest;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.request.ShopOrderPayRequest;
import com.doumee.dao.web.request.goods.DealOrderRequest;
import com.doumee.dao.web.request.goods.MemberOrderRequest;
import com.doumee.dao.web.request.goods.OrderCommentRequest;
import com.doumee.dao.web.response.HomeInfoResponse;
import com.doumee.dao.web.response.MyPageResponse;
import com.doumee.dao.web.response.goods.MemberOrderResponse;
import com.doumee.dao.web.response.goods.PayResponse;
import com.doumee.service.business.impl.MemberCouponServiceImpl;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -60,7 +67,7 @@
    void orderSendOutGoods(Goodsorder goodsorder);

    void orderRemark(Goodsorder goodsorder);

    IPage<Shop> getShopPage(PageWrap<Shop> pageWrap);
    void coffeePlanCancelOrder(Goodsorder goodsorder);
    void orderPlanCancelOrder(Goodsorder goodsorder);

@@ -120,7 +127,7 @@
     * @param orderPayRequest
     * @return
     */
    PayResponse orderPay(OrderPayRequest orderPayRequest);
    PayResponse orderPay(ShopOrderPayRequest orderPayRequest, MemberCouponServiceImpl memberCouponService);

    /**
     * é‡æ–°æ”¯ä»˜
@@ -144,13 +151,20 @@
    void updAddress(DealOrderRequest updAddressRequest);

    /**
     * å–消订单
     * å–消订单 - åŽ†å²ç‰ˆæœ¬
     * @param orderId
     * @param optUserId
     * @param cancelInfo
     */
    void cancelOrder(Integer orderId,Integer optUserId,String cancelInfo);

    /**
     * è®¢å•å–消 - æ–°
     * @param orderId
     * @param optUserId
     * @param cancelInfo
     */
    void cancelOrderNew(Integer orderId,Integer optUserId,String cancelInfo);

    /**
     * å‚¬å‘è´§
@@ -167,6 +181,14 @@
     */
    void affirmOrder(Integer orderId,Integer memberId);

    void orderWriteOff(String exchangeCode,Integer memberId);

    /**
     * è®¢å•åˆ é™¤
     * @param orderId
     * @param memberId
     */
    void delOrder(Integer orderId,Integer memberId);

    /**
     * è®¢å•è¯¦æƒ…
@@ -190,6 +212,7 @@
    MyPageResponse ordersStatistics(Integer memberId);



    /**
     * è®¢å•è‡ªåŠ¨ç¡®è®¤
     */
@@ -198,4 +221,6 @@
    void resetOrderCodes();

    void refreshOrderCodes();

    HomeInfoResponse getHomeInfo(int memberId);
}

 server/dmmall_service/src/main/java/com/doumee/service/business/IntegralService.java

@@ -115,10 +115,17 @@
     */
    PageData<IntegralDTO> findIntegralDTOPage(PageWrap<IntegralDTO> pageWrap,Integer memberId);
    /**
     * æ›´æ–°ç§¯åˆ†ä¿¡æ¯
     * æ›´æ–°æ¶ˆè´¹è€…积分
     * @param dealIntegralRequest å®žä½“对象
     * @return Integer
     */
    Integer dealIntegral(DealIntegralRequest dealIntegralRequest);

    /**
     * æ›´æ–°ç»é”€å•†ä½™é¢
     * @param dealIntegralRequest
     * @return
     */
    Integer dealShopIntegral(DealIntegralRequest dealIntegralRequest);

}

 server/dmmall_service/src/main/java/com/doumee/service/business/MemberCouponService.java

@@ -6,6 +6,8 @@
import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.dto.MemberCouponDTO;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.response.MemberCouponResponse;

import java.math.BigDecimal;
import java.util.List;
@@ -110,9 +112,14 @@
     * @param couponType
     * @return
     */
     IPage<CouponDTO> memberCouponPage(IPage pages, BigDecimal price, Integer memberId, Integer couponType);
     IPage<MemberCouponResponse> memberCouponPage(IPage pages, BigDecimal price, Integer memberId, Integer couponType, Integer status);


    /**
     * ä¼šå‘˜ä¼˜æƒ åˆ¸è¯¦æƒ…
     * @param id
     * @return
     */
    MemberCouponResponse getMemberCouponDetail(Integer id);
    /**
     * å¯ç”¨ä¼˜æƒ åˆ¸æ•°é‡
     * @param price
@@ -130,4 +137,12 @@
     */
    PageData<MemberCouponDTO> findMemberCouponDTO(PageWrap<MemberCouponDTO> pageWrap);

    /**
     * æ ¹æ®å•†å“é€‰æ‹©ä¿¡æ¯ æŸ¥è¯¢å¯¹åº”可使用的优惠券
     * @param requestList
     * @param memberId
     * @return
     */
    List<MemberCoupon> getApplyCoupon(List<PayDetailRequest> requestList, Integer memberId);

}

 server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java

@@ -7,6 +7,7 @@
import com.doumee.dao.system.dto.MemberRechargeDTO;
import com.doumee.dao.web.dto.MemberOwnDTO;
import com.doumee.dao.web.dto.shop.Position;
import com.doumee.dao.web.request.UpdMobileRequest;
import com.doumee.dao.web.request.UpdateMemberRequest;
import com.doumee.dao.web.request.WxPhoneRequest;
import com.doumee.dao.web.response.AccountResponse;
@@ -144,8 +145,17 @@
     */
    Member updateMember(UpdateMemberRequest updateMemberRequest);

    /**
     * éªŒè¯æ‰‹æœºå·
     * @param request
     */
    void verifyUserPhone(UpdMobileRequest request);


    /**
     * æ¢ç»‘手机号
     * @param request
     */
    void updateUserPhone(UpdMobileRequest request);

    MemberOwnDTO getMemberOwnDTO(Integer memberId);


 server/dmmall_service/src/main/java/com/doumee/service/business/ShopGoodsRelationService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.doumee.service.business;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.ShopGoodsRelation;
import java.util.List;

/**
 * ç»é”€å•†ä¾›è´§ä»·ä¿¡æ¯Service定义
 * @author æ±Ÿè¹„蹄
 * @date 2025/12/15 09:39
 */
public interface ShopGoodsRelationService {

    /**
     * åˆ›å»º
     * 
     * @param shopGoodsRelation å®žä½“对象
     * @return Integer
     */
    Integer create(ShopGoodsRelation shopGoodsRelation);

    /**
     * ä¸»é”®åˆ é™¤
     *
     * @param id ä¸»é”®
     */
    void deleteById(Integer id);

    /**
     * åˆ é™¤
     *
     * @param shopGoodsRelation å®žä½“对象
     */
    void delete(ShopGoodsRelation shopGoodsRelation);

    /**
     * æ‰¹é‡ä¸»é”®åˆ é™¤
     *
     * @param ids ä¸»é”®é›†
     */
    void deleteByIdInBatch(List<Integer> ids);

    /**
     * ä¸»é”®æ›´æ–°
     *
     * @param shopGoodsRelation å®žä½“对象
     */
    void updateById(ShopGoodsRelation shopGoodsRelation);

    /**
     * æ‰¹é‡ä¸»é”®æ›´æ–°
     *
     * @param shopGoodsRelations å®žä½“集
     */
    void updateByIdInBatch(List<ShopGoodsRelation> shopGoodsRelations);

    /**
     * ä¸»é”®æŸ¥è¯¢
     *
     * @param id ä¸»é”®
     * @return ShopGoodsRelation
     */
    ShopGoodsRelation findById(Integer id);

    /**
     * æ¡ä»¶æŸ¥è¯¢å•æ¡è®°å½•
     *
     * @param shopGoodsRelation å®žä½“对象
     * @return ShopGoodsRelation
     */
    ShopGoodsRelation findOne(ShopGoodsRelation shopGoodsRelation);

    /**
     * æ¡ä»¶æŸ¥è¯¢
     *
     * @param shopGoodsRelation å®žä½“对象
     * @return List<ShopGoodsRelation>
     */
    List<ShopGoodsRelation> findList(ShopGoodsRelation shopGoodsRelation);
  
    /**
     * åˆ†é¡µæŸ¥è¯¢
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return PageData<ShopGoodsRelation>
     */
    PageData<ShopGoodsRelation> findPage(PageWrap<ShopGoodsRelation> pageWrap);

    /**
     * æ¡ä»¶ç»Ÿè®¡
     *
     * @param shopGoodsRelation å®žä½“对象
     * @return long
     */
    long count(ShopGoodsRelation shopGoodsRelation);
}

 server/dmmall_service/src/main/java/com/doumee/service/business/ShopcartService.java

@@ -111,6 +111,12 @@
     */
    IPage<CartGoodsResponse> cartGoodsPage(PageWrap pageWrap, Integer memberId);

    /**
     * è´­ç‰©è½¦å•†å“æ•°é‡
     * @param memberId
     * @return
     */
    Integer cartGoodsTypeNum(Integer memberId);

    /**
     * æ›´æ–°è´­ç‰©è½¦æ•°é‡ä¿¡æ¯

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java

@@ -821,45 +821,66 @@
     */
    @Override
    public IPage<GoodsInfoResponse> getGoodsPage(PageWrap<GoodsRequest> pageWrap) {
       GoodsRequest model = pageWrap.getModel();

       QueryWrapper<GoodsRequest> wrapper = new QueryWrapper<GoodsRequest>()
                .eq("g.ISDELETED",Constants.ZERO)
                .eq("g.PARENT_CATEGORY_ID",pageWrap.getModel().getParentCategoryId())
                .eq(!Objects.isNull(pageWrap.getModel()) && Objects.nonNull(pageWrap.getModel().getCategoryId()),
                        "g.CATEGORY_ID", pageWrap.getModel().getCategoryId())
                .eq(!Objects.isNull(model) && Objects.nonNull(model.getCategoryId()),
                        "g.CATEGORY_ID", model.getCategoryId())

               //TODO é€‚用品牌  é€‚用系列
//               .eq(!Objects.isNull(model) && Objects.nonNull(model.getApplicableBrandId()),
//                       "","")
//               .eq(!Objects.isNull(model) && Objects.nonNull(model.getSeriesBrandId()),
//                       "","")

                .eq("g.STATUS", Constants.ZERO)
                .like(StringUtils.isNotBlank(pageWrap.getModel().getGoodsName()),"g.NAME",pageWrap.getModel().getGoodsName());
//                .eq(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getType()), "g.TYPE", pageWrap.getModel().getType());
                .like(StringUtils.isNotBlank(model.getGoodsName()),"g.NAME",model.getGoodsName());

                for(PageWrap.SortData sortData:pageWrap.getSorts1()){
                    if ("CREATE_DATE".equalsIgnoreCase(sortData.getProperty())){
                        if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
                            wrapper.orderByAsc("g.CREATE_DATE");
                        }
                if(Objects.nonNull(model.getSortInfo())){
                    //排序方式：0=综合排序；1=销量由低到高 ï¼›2=价格由低到高；3=销量由高到低；4=价格由高到低
                    if(Constants.equalsInteger(model.getSortInfo(),Constants.ZERO)){
                        wrapper.orderByDesc("g.CREATE_DATE");

                    }
                    if ("realSaleNum".equalsIgnoreCase(sortData.getProperty())){

                        if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
                            wrapper.orderByAsc("realSaleNum");
                        }
                    }else if(Constants.equalsInteger(model.getSortInfo(),Constants.ONE)){
                        wrapper.orderByAsc("realSaleNum");
                    }else if(Constants.equalsInteger(model.getSortInfo(),Constants.TWO)){
                        wrapper.orderByAsc("g.price");
                    }else if(Constants.equalsInteger(model.getSortInfo(),Constants.THREE)){
                        wrapper.orderByDesc("realSaleNum");
                    }else if(Constants.equalsInteger(model.getSortInfo(),Constants.FOUR)){
                        wrapper.orderByDesc("g.price");
                    }
                    if ("PRICE".equalsIgnoreCase(sortData.getProperty())){
                        if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
                            wrapper.orderByAsc("g.PRICE");
                        }
                        wrapper.orderByDesc("g.PRICE");
                    }

                }

//                for(PageWrap.SortData sortData:pageWrap.getSorts1()){
//                    if ("CREATE_DATE".equalsIgnoreCase(sortData.getProperty())){
//                        if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
//                            wrapper.orderByAsc("g.CREATE_DATE");
//                        }
//                        wrapper.orderByDesc("g.CREATE_DATE");
//
//                    }
//                    if ("realSaleNum".equalsIgnoreCase(sortData.getProperty())){
//
//                        if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
//                            wrapper.orderByAsc("realSaleNum");
//                        }
//                        wrapper.orderByDesc("realSaleNum");
//                    }
//                    if ("PRICE".equalsIgnoreCase(sortData.getProperty())){
//                        if (PageWrap.ASC.equalsIgnoreCase(sortData.getDirection())){
//                            wrapper.orderByAsc("g.PRICE");
//                        }
//                        wrapper.orderByDesc("g.PRICE");
//                    }
//
//                }

        IPage<GoodsInfoResponse> page = goodsMapper.goodsPage(pageWrap.toPage(),wrapper);
        if (!CollectionUtils.isEmpty(page.getRecords())){
            String preFixPath = systemDictDataBiz.getPreFixPath(Constants.RESOURCE_PATH, Constants.GOODS_FILE);
            page.getRecords().forEach(s->s.setImgurl(preFixPath+s.getImgurl()));

        }


@@ -898,6 +919,7 @@

        String fullUrl = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
                systemDictDataBiz.queryByCode(Constants.OSS,Constants.GOODS_FILE).getCode();
        Integer sumStock = Constants.ZERO;
        for (GoodsSkuResponse goodsSkuResponse:goodsSkuResponseList) {
            if(StringUtils.isBlank(goodsSkuResponse.getImgurl())){
                goodsSkuResponse.setImgurl(fullUrl + goodsSkuResponse.getGoodsImgUrl());
@@ -930,8 +952,11 @@
                indexData.append("," + ( skuAttr.getSortnum()-1));
            }
            goodsSkuResponse.setIndexData(indexData.toString().substring(1));
            sumStock = sumStock + goodsSkuResponse.getStock();
        }

        //真实销量 = realSaleNum  - saleNum;
        //真实库存= sumStock - (realSaleNum  - saleNum)
        goodsResponse.setStock(sumStock - goodsResponse.getRealSaleNum() + goodsResponse.getSaleNum());
        goodsResponse.setGoodsSkuResponseList(goodsSkuResponseList);
        //Sku基础信息
        List<SkuResponse> skuResponseList = skuMapper.getSkuResponseList(goodsResponse.getId());
@@ -953,7 +978,7 @@
                systemDictDataBiz.queryByCode(Constants.OSS,Constants.GOODS_FILE).getCode();
        GoodsInfoResponse goodsResponse = goodsMapper.getGoodsInfo(goodsId);
        if(Objects.isNull(goodsResponse)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"当前专区关联商品已删除");
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        goodsResponse.setImgurl(fullUrl + goodsResponse.getImgurl());
        //查询商品的分类
@@ -970,6 +995,7 @@
                                                                                            Constants.GOODS_FILE);
        List<MultiFileDTO> multiFileDTOS = objAllFileUrl.get(Constants.MultiFile.PLATFORM_GOOD_ROTATION.getKey());
        goodsResponse.setGoodBannerMultiFiles(multiFileDTOS);

        return goodsResponse;
    }


 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java

@@ -8,10 +8,7 @@
import com.doumee.core.model.LoginUserInfo;
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.RedisUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.utils.*;
import com.doumee.core.utils.kuaidi100.DeliveryDTO;
import com.doumee.core.utils.kuaidi100.ExpressUtils;
import com.doumee.core.wx.SendWxMessage;
@@ -22,17 +19,15 @@
import com.doumee.dao.business.join.GoodsorderJoinMapper;
import com.doumee.dao.business.join.PlanorderDetailJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.request.DealIntegralRequest;
import com.doumee.dao.web.request.OrderPayRequest;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.request.*;
import com.doumee.dao.web.request.goods.MemberOrderRequest;
import com.doumee.dao.web.request.goods.DealOrderRequest;
import com.doumee.dao.web.request.goods.OrderCommentRequest;
import com.doumee.dao.web.request.goods.OrderGoodsCommentRequest;
import com.doumee.dao.web.response.HomeInfoResponse;
import com.doumee.dao.web.response.MyPageResponse;
import com.doumee.dao.web.response.goods.MemberOrderDetailResponse;
import com.doumee.dao.web.response.goods.MemberOrderResponse;
import com.doumee.dao.web.response.goods.PayResponse;
import com.doumee.dao.web.response.goods.*;
import com.doumee.service.business.AreasService;
import com.doumee.service.business.GoodsorderService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -44,15 +39,16 @@
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

@@ -61,6 +57,8 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
import java.util.Date;
import java.util.stream.Collectors;

/**
 * å•†å“è®¢å•ä¿¡æ¯è¡¨Service实现
@@ -78,7 +76,8 @@
    private ActivitySignMapper activitySignMapper;
    @Autowired
    private AftersaleMapper  aftersaleMapper;

    @Autowired
    private ShopGoodsRelationMapper shopGoodsRelationMapper;
    @Autowired
    private MemberMapper memberMapper;

@@ -95,7 +94,16 @@
    private AddrMapper addrMapper;

    @Autowired
    private ShopMapper shopMapper;

    @Autowired
    private ShopGoodsRelationMapper relationMapper;

    @Autowired
    private MemberCouponMapper memberCouponMapper;

    @Autowired
    private CollectMapper collectMapper;

    @Autowired
    private WxMiniUtilService wxMiniUtilService;
@@ -129,6 +137,9 @@

    @Autowired
    private GoodsorderDetailJoinMapper goodsorderDetailJoinMapper;

    @Autowired
    private IntegralMapper integralMapper;

    @Override
    public Integer create(Goodsorder goodsorder) {
@@ -179,6 +190,29 @@
        goodsorder.setEditor(user.getId());
        goodsorderMapper.updateById(goodsorder);
    }

    @Override
    public IPage<Shop> getShopPage(PageWrap<Shop> pageWrap) {
        IPage<Shop> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        Shop model = pageWrap.getModel();
        if(Objects.isNull(model.getLatitude())||Objects.isNull(model.getLongitude())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        return shopMapper.selectPage(page,new MPJLambdaWrapper<Shop>()
                        .selectAll(Shop.class)
                .select(" case when LONGITUDE IS NULL OR LATITUDE IS NULL THEN 0 " +
                        " when t.TYPE = 0 then CONVERT( ST_Distance_Sphere ( POINT ( LONGITUDE, LATITUDE ), POINT ( "+model.getLongitude()+", "+model.getLatitude()+" )) /1000,DECIMAL(15,2))  " +
                        " when t.TYPE = 1 then   CONVERT( ST_Distance_Sphere ( POINT ( LONGITUDE, LATITUDE ), POINT ( "+model.getLongitude()+", "+model.getLatitude()+" )) /1000,DECIMAL(15,2)) " +
                        " else  CONVERT( ST_Distance_Sphere ( POINT ( LONGITUDE, LATITUDE ), POINT ( "+model.getLongitude()+", "+model.getLatitude()+" )) /1000,DECIMAL(15,2)) end " , Shop::getDistance)
                        .eq(Shop::getIsdeleted,Constants.ZERO)
                        .eq(Shop::getStatus,Constants.ZERO)
                        .like(StringUtils.isNotBlank(model.getAddr()),Shop::getAddr,model.getAddr())
                        .like(StringUtils.isNotBlank(model.getName()),Shop::getName,model.getName())
                .orderByAsc(" distance ")
        );
    }


    /**
     * å’–豆 å•†åŸŽè®¢å•å‘è´§
     * @param goodsorder
@@ -500,7 +534,6 @@
    /****************************************移动端接口开始********************************************************************/


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public PayResponse orderPay(OrderPayRequest orderPayRequest){
        Member member = memberMapper.selectById(orderPayRequest.getMemberId());
@@ -614,7 +647,7 @@
        goodsorderMapper.insert(goodsorder);
        //数据存储
        BigDecimal total = Constants.formatBigdecimal(goodsorder.getPrice()).add(Constants.formatBigdecimal(goodsorder.getIntegral())).add(Constants.formatBigdecimal(goodsorder.getCouponPrice()));
        BigDecimal rate =Constants.formatBigdecimal(goodsorder.getCouponPrice()) .divide(total,4,BigDecimal.ROUND_HALF_UP);
        BigDecimal rate =Constants.formatBigdecimal(goodsorder.getCouponPrice()).divide(total,4,BigDecimal.ROUND_HALF_UP);
        BigDecimal totalWxMoney = new BigDecimal(0);
        BigDecimal totalIntegral = new BigDecimal(0);
        for (int i =0;i< goodsOrderDetailList.size();i++) {
@@ -630,7 +663,7 @@
                //当前明细实际价格
                BigDecimal detialTotal = Constants.formatBigdecimal(goodsOrderDetail.getPrice()).multiply(new BigDecimal(Constants.formatIntegerNum(goodsOrderDetail.getGoodsNum())));
                //折算优惠券后支付价格（包含现金和余额部分）
                BigDecimal  actDetialTotal = detialTotal .subtract(detialTotal.multiply(rate));
                BigDecimal  actDetialTotal = detialTotal.subtract(detialTotal.multiply(rate));
                //按现金和积分支付比例，折算每个明细现金和积分支付的数量
                BigDecimal rate1 = detialTotal .divide(total,4,BigDecimal.ROUND_HALF_UP);
                //可退现金金额
@@ -680,6 +713,179 @@
    }



    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public PayResponse orderPay(ShopOrderPayRequest orderPayRequest,MemberCouponServiceImpl memberCouponService){
        Member member = memberMapper.selectById(orderPayRequest.getMemberId());

        Goodsorder goodsorder = new Goodsorder();
        goodsorder.setCreator(orderPayRequest.getMemberId());
        goodsorder.setIntegral(BigDecimal.ZERO);
        goodsorder.setCreateDate(new Date());
        goodsorder.setIsdeleted(Constants.ZERO);
        goodsorder.setMemberInfo(orderPayRequest.getRemark());
        goodsorder.setMemberId(member.getId());
        goodsorder.setType(Constants.ZERO);
        goodsorder.setStatus(Constants.ZERO);

        if(Constants.equalsInteger(orderPayRequest.getReceiveType(),Constants.ZERO)){
            //查询收货地址
            Addr addr = addrMapper.selectById(orderPayRequest.getAddressId());
            if(Objects.isNull(addr)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到收货地址信息！");
            }
            Areas area = areasService.findById(addr.getAreaId(), Constants.TWO);
            if(Objects.isNull(area)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"收货地址区划信息发生变化，请更新后下单！");
            }

            goodsorder.setAddrId(addr.getId());
            goodsorder.setLinkaddr(area.getProvinceName()+area.getCityName() + area.getName() + addr.getAddr());
            goodsorder.setLinkphone(addr.getPhone());
            goodsorder.setLinkname(addr.getName());
            if(Objects.nonNull(member.getBindShopId())){
                goodsorder.setDistributionShopId(member.getBindShopId());
            }
        }else{
            if(Objects.isNull(orderPayRequest.getShopId())){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"请选择正确的自提门店！");
            }
            Shop shop = shopMapper.selectById(orderPayRequest.getShopId());
            if(Objects.isNull(shop)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"请选择正确的自提门店！");
            }


            //根据选择商户进行会员与商户信息绑定
            if(Objects.isNull(member.getBindShopId())){
                memberMapper.update(new UpdateWrapper<Member>().lambda()
                        .set(Member::getBindShopId,shop.getId())
                        .eq(Member::getId,member.getId())
                );
            }
            goodsorder.setPickUpShopId(shop.getId());
            goodsorder.setDistributionShopId(shop.getId());
            if(Objects.isNull(member.getBindShopId())){
                member.setBindShopId(shop.getId());
            }
        }
        //单据编号 è‡ªå¢ž
        goodsorder.setCode(getNextInCode());
        //计算订单总金额
        BigDecimal sumPrice = BigDecimal.ZERO;

        //存储记录明细
        OrderPayConfirmResponse orderPayConfirmResponse = this.orderPayConfirm(orderPayRequest.getReceiveType(),orderPayRequest.getPayDetailRequestList(),orderPayRequest.getAddressId(),memberCouponService,member.getId());
        if(Objects.isNull(orderPayConfirmResponse)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"系统支付错误,请联系管理员");
        }
        goodsorder.setPrice(orderPayConfirmResponse.getPayAmount());
        goodsorder.setTotalPrice(orderPayConfirmResponse.getAmount());
        goodsorder.setUseIntegral(orderPayConfirmResponse.getDeductIntegral());
        goodsorder.setIntegral(goodsorder.getUseIntegral());
        goodsorder.setIntegralPrice(orderPayConfirmResponse.getIntegralAmount());

        if(Objects.nonNull(orderPayConfirmResponse.getMemberCoupon())){
            MemberCoupon memberCoupon = memberCouponMapper.selectById(orderPayConfirmResponse.getMemberCoupon().getId());
            if(Objects.isNull(memberCoupon)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到优惠券信息！");
            }
            if(memberCoupon.getStatus().equals(Constants.ONE)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"优惠券已使用！");
            }
            sumPrice = sumPrice.subtract(memberCoupon.getPrice());
            goodsorder.setCouponId(memberCoupon.getId());
            goodsorder.setCouponPrice(orderPayConfirmResponse.getMemberCoupon().getValidAmount());

            memberCouponMapper.update(null,new UpdateWrapper<MemberCoupon>().lambda()
                    .set(MemberCoupon::getStatus,Constants.ONE)
                    .set(MemberCoupon::getUseDate,DateUtil.getCurrDateTime())
                    .eq(MemberCoupon::getId,memberCoupon.getId())
            );
        }

        goodsorderMapper.insert(goodsorder);
        List<OrderGoodsCalculateResponse> goodsCalculateList  = orderPayConfirmResponse.getGoodsCalculateList();
        if(CollectionUtils.isEmpty(goodsCalculateList)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"无明细数据,请检查选择数据！");
        }
        List<GoodsorderDetail> goodsOrderDetailList = new ArrayList<>();
        for (OrderGoodsCalculateResponse payDetailRequest:goodsCalculateList) {
            //查询商品
            GoodsSku goodsSku = goodsSkuMapper.selectById(payDetailRequest.getSkuId());
            if(Objects.isNull(goodsSku)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到商品SKU信息！");
            }
            Goods goods = goodsMapper.selectById(goodsSku.getGoodsId());
            if(Objects.isNull(goods)){
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到商品信息！");
            }
            if(goods.getStatus().equals(Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在商品已删除或已下架，无法下单");
            }
            if(goodsSku.getStock().compareTo(new BigDecimal(Constants.formatIntegerNum(payDetailRequest.getGoodsNum())))<Constants.ZERO){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"存在商品库存不足，无法下单！");
            }
            //商品库存扣除
            goodsSku.setStock(goodsSku.getStock().subtract(new BigDecimal(Constants.formatIntegerNum(payDetailRequest.getGoodsNum()))));
            goodsSkuMapper.updateById(goodsSku);
            GoodsorderDetail goodsOrderDetail = new GoodsorderDetail();
            goodsOrderDetail.setCreator(member.getId());
            goodsOrderDetail.setCreateDate(new Date());
            goodsOrderDetail.setImgurl(StringUtils.isBlank(goodsSku.getImgurl())?goods.getImgurl():goodsSku.getImgurl());
            goodsOrderDetail.setName(goods.getName());
            goodsOrderDetail.setGoodsSkuId(goodsSku.getId().toString());
            goodsOrderDetail.setSkuName(goodsSku.getName());
            goodsOrderDetail.setPrice(goodsSku.getPrice());
            goodsOrderDetail.setGoodsNum(payDetailRequest.getGoodsNum());
            goodsOrderDetail.setGoodsWeight(payDetailRequest.getWeight());
            goodsOrderDetail.setCouponDeduct(payDetailRequest.getCouponDeductCash());
            goodsOrderDetail.setIntegralDeduct(payDetailRequest.getIntegralDeductCash());
            goodsOrderDetail.setOrderId(goodsorder.getId());

            //判断门店是否设置商品的价格信息
            if(Objects.nonNull(goodsorder.getDistributionShopId())){
                ShopGoodsRelation shopGoodsRelation = relationMapper.selectOne(new QueryWrapper<ShopGoodsRelation>().lambda()
                        .eq(ShopGoodsRelation::getIsdeleted,Constants.ZERO) .eq(ShopGoodsRelation::getShopId,goodsorder.getDistributionShopId())
                        .eq(ShopGoodsRelation::getStatus,Constants.ZERO)
                        .eq(ShopGoodsRelation::getIsdeleted,Constants.ZERO)
                        .eq(ShopGoodsRelation::getGoodsSkuId,goodsOrderDetail.getGoodsSkuId())
                        .last(" limit 1 ")
                );
                if(Objects.isNull(shopGoodsRelation)){
                    throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"对不起，关联经销商未绑定["+goods.getName()+"]商品，请联系管理员！");
                }
                goodsOrderDetail.setShopSettlement(shopGoodsRelation.getPrice());
            }
            goodsOrderDetailList.add(goodsOrderDetail);
            //删除购物车商品
            shopcartMapper.delete(new QueryWrapper<Shopcart>().lambda()
                    .eq(Shopcart::getMemberId,member.getId())
                    .eq(Shopcart::getGoodsSkuId,goodsOrderDetail.getGoodsSkuId())
            );
        }
        //积分变动记录
        if(goodsorder.getUseIntegral().compareTo(BigDecimal.ZERO)>Constants.ZERO){
            //更新余额信息 æ·»åŠ ç§¯åˆ†å˜åŠ¨è®°å½•
            DealIntegralRequest dealIntegralRequest = new DealIntegralRequest();
            dealIntegralRequest.setIntegralNum(goodsorder.getUseIntegral());
            dealIntegralRequest.setDealType(Constants.ONE);
            dealIntegralRequest.setMemberId(member.getId());
            dealIntegralRequest.setObjId(goodsorder.getId());
            dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.SHOP_ORDER);
            integralService.dealIntegral(dealIntegralRequest);
        }

        if(goodsorder.getPrice().compareTo(orderPayRequest.getTitlePrice())!=Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"商品价格发生变化，请刷新后重新支付！");
        }

        return this.wxPay(goodsorder,member);
    }


    /**
     * é‡æ–°æ”¯ä»˜
     * @param orderId
@@ -715,7 +921,7 @@
            Object response = null;
            WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
            request.setBody("平台商城");
            request.setAttach("terraceMall");
            request.setAttach("shopGoods");
            request.setOutTradeNo(goodsorder.getCode().toString());
            request.setTotalFee(BaseWxPayRequest.yuanToFen(goodsorder.getPrice().toString()));
          //  request.setTotalFee(2);
@@ -781,6 +987,9 @@
            j.setImgUrl(fullUrl + j.getImgUrl());
        });
        memberOrderResponse.setMemberOrderDetailResponseList(memberOrderDetailResponseList);
        if(Constants.equalsInteger(memberOrderResponse.getReceiveType(),Constants.ONE)){
            memberOrderResponse.setShopInfo(shopMapper.selectById(memberOrderResponse.getShopId()));
        }
        return memberOrderResponse;
    }

@@ -900,6 +1109,264 @@
    }


    @Override
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void cancelOrderNew(Integer orderId,Integer optUserId,String cancelInfo){
        if(Objects.isNull(orderId)){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        if(Objects.isNull(goodsorder)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!(Constants.equalsInteger(goodsorder.getStatus(),Constants.OrderStatus.WAIT_PAY.getKey())
        || Constants.equalsInteger(goodsorder.getStatus(),Constants.OrderStatus.PAY_DONE.getKey()) 
        || Constants.equalsInteger(goodsorder.getStatus(),Constants.OrderStatus.WAIT_RECEIVE.getKey()) )){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"订单取消失败：订单状态已流转！");
        }
        if(goodsorder.getPrice().compareTo(BigDecimal.ZERO)>Constants.ZERO){
            //微信现金退款
            String refundCode = WxMiniUtilService.wxRefund(goodsorder.getCode().toString(), goodsorder.getPrice(), goodsorder.getPrice());
            Fund fund = new Fund();
            fund.setOrderCode(refundCode);
            fund.setCreateDate(new Date());
            fund.setIsdeleted(Constants.ZERO);
            fund.setRemark(goodsorder.getId().toString());
            fund.setMemberId(goodsorder.getCreator());
            fund.setTitle("订单取消");
            fund.setContent(StringUtils.isBlank(cancelInfo)?"用户主动取消":cancelInfo);
            fund.setObjId(goodsorder.getId());
            fund.setObjType(Constants.ONE);
            fund.setType(Constants.ONE);
            fund.setNum(goodsorder.getPrice());
            fundMapper.insert(fund);
        }
        if(goodsorder.getIntegral().compareTo(BigDecimal.ZERO)>Constants.ZERO){
            //更新余额信息 æ·»åŠ ç§¯åˆ†å˜åŠ¨è®°å½•
            DealIntegralRequest dealIntegralRequest = new DealIntegralRequest();
            dealIntegralRequest.setIntegralNum(goodsorder.getIntegral());
            dealIntegralRequest.setDealType(Constants.ZERO);
            dealIntegralRequest.setMemberId(goodsorder.getMemberId());
            dealIntegralRequest.setObjId(goodsorder.getId());
            dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.SHOP_ORDER_CANCEL);
            integralService.dealIntegral(dealIntegralRequest);
        }
        //订单信息取消
        goodsorder.setStatus(Constants.OrderStatus.CLOSE.getKey());
        goodsorder.setCancelDate(new Date());
        goodsorder.setCancelInfo(StringUtils.isBlank(cancelInfo)?"用户主动取消":cancelInfo);
        goodsorder.setCancelUser(optUserId);
        goodsorderMapper.updateById(goodsorder);
        String goodsName = "";
        List<GoodsorderDetail> goodsorderDetailList =  goodsorderDetailMapper.selectList(new QueryWrapper<GoodsorderDetail>().eq("ORDER_ID",goodsorder.getId()));
        if(!Objects.isNull(goodsorderDetailList)&&goodsorderDetailList.size()>Constants.ZERO){
            for (GoodsorderDetail goodsorderDetail:goodsorderDetailList) {
                GoodsSku goodsSku = goodsSkuMapper.selectById(goodsorderDetail.getGoodsSkuId());
                if(StringUtils.isBlank(goodsName)){
                    Goods goods = goodsMapper.selectById(goodsSku.getGoodsId());
                    goodsName = goods.getName();
                }
                if(!Objects.isNull(goodsSku)){
                    goodsSku.setStock(goodsSku.getStock().add(new BigDecimal(Constants.formatIntegerNum(goodsorderDetail.getGoodsNum()))));
                    goodsSkuMapper.updateById(goodsSku);
                }
            }
        }

        //SendWxMessage.orderCancel(goodsorder,memberMapper.selectById(goodsorder.getMemberId()),goodsName);

        //查询优惠券信息记录
        if(!Objects.isNull(goodsorder.getCouponId())){
            MemberCoupon memberCoupon = memberCouponMapper.selectById(goodsorder.getCouponId());
            if(!Objects.isNull(memberCoupon)){
                memberCoupon.setStatus(Constants.ZERO);
                memberCouponMapper.updateById(memberCoupon);
            }
        }
    }





    public BigDecimal getDeductAmount(List<PayDetailRequest> requestList){
        List<MemberCoupon> memberCouponList = new ArrayList<>();

        List<GoodsSku> goodsSkuList = goodsSkuMapper.selectList(new QueryWrapper<GoodsSku>()
                .lambda()
                .eq(GoodsSku::getIsdeleted,Constants.ZERO)
                .in(GoodsSku::getId,requestList.stream().map(i->i.getGoodsSkuId()).collect(Collectors.toList()))
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isEmpty(goodsSkuList)||!Constants.equalsInteger(goodsSkuList.size(),requestList.size())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"商品SKU信息错误,请刷新重试");
        }

        //查询商品列表
        List<Goods> goodsList = goodsMapper.selectJoinList(Goods.class,
                new MPJLambdaWrapper<Goods>()
                        .selectAs(GoodsSku::getPrice,Goods::getSkuPrice)
                        .selectAs(GoodsSku::getId,Goods::getSkuId)
                        .leftJoin(GoodsSku.class,GoodsSku::getGoodsId,Goods::getId)
                        .in(GoodsSku::getId,requestList.stream().map(i->i.getGoodsSkuId()).collect(Collectors.toList())));
        if(Objects.isNull(goodsList)){
            return BigDecimal.ZERO;
        }
        //获取选择的商品总金额 ä¸Ž å•ä¸ªå•†å“é‡‘额
        BigDecimal deductAmount = BigDecimal.ZERO;
        for (Goods goods:goodsList) {
            List<PayDetailRequest> request = requestList.stream().filter(i->Constants.equalsInteger(i.getGoodsSkuId(), goods.getSkuId())).collect(Collectors.toList());
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(request)){
                goods.setSkuAmount(goods.getSkuPrice().multiply(new BigDecimal(request.get(Constants.ZERO).getGoodsNum()+"")));
                deductAmount = deductAmount.add(goods.getSkuAmount().multiply(goods.getDeductRata()));
            }
        }
        return deductAmount;
    }


    /**
     * è®¢å•ç¡®è®¤æŽ¥å£
     * @param receiveType 0=快递配送 1=自提
     * @param requestList
     * @param addressId
     * @param memberCouponService
     * @param memberId
     */
    public OrderPayConfirmResponse orderPayConfirm(Integer receiveType,List<PayDetailRequest> requestList,Integer addressId,
                                MemberCouponServiceImpl memberCouponService,Integer memberId){
        OrderPayConfirmResponse orderPayConfirmResponse = new OrderPayConfirmResponse();
        List<Goods> goodsList = goodsMapper.selectJoinList(Goods.class,
                new MPJLambdaWrapper<Goods>()
                        .selectAs(GoodsSku::getPrice,Goods::getSkuPrice)
                        .selectAs(GoodsSku::getId,Goods::getSkuId)
                        .selectAs(GoodsSku::getIntegralRate,Goods::getDeductRata)
                        .selectAs(GoodsSku::getWeight,Goods::getWeight)
                        .selectAs(GoodsSku::getImgurl,Goods::getSkuImg)
                        .leftJoin(GoodsSku.class,GoodsSku::getGoodsId,Goods::getId)
                        .in(GoodsSku::getId,requestList.stream().map(i->i.getGoodsSkuId()).collect(Collectors.toList())));
        if(CollectionUtils.isEmpty(goodsList)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"未匹配到商品信息");
        }

        List<OrderGoodsCalculateResponse> goodsCalculateList = ListUtil.copyProperties(goodsList,OrderGoodsCalculateResponse::new);

        //订单总金额
        BigDecimal amount = BigDecimal.ZERO;
        //优惠券抵扣金额
        BigDecimal couponAmount = BigDecimal.ZERO;
        //积分抵扣金额
        BigDecimal integralAmount = BigDecimal.ZERO;
        //抵扣积分值
        BigDecimal deductIntegral = BigDecimal.ZERO;
        //邮费金额
        BigDecimal mailAmount = BigDecimal.ZERO;
        for (OrderGoodsCalculateResponse response:goodsCalculateList) {
            List<PayDetailRequest> request = requestList.stream().filter(i->Constants.equalsInteger(i.getGoodsSkuId(), response.getSkuId())).collect(Collectors.toList());
            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(request)){
                PayDetailRequest payDetailRequest = request.get(Constants.ZERO);
                response.setSkuAmount(response.getSkuPrice().multiply(new BigDecimal(payDetailRequest.getGoodsNum()+"")));
                response.setGoodsNum(payDetailRequest.getGoodsNum());
                amount = amount.add(response.getSkuAmount());
            }
        }
        //获取优惠券优惠金额
        List<MemberCoupon> memberCouponList = memberCouponService.getApplyCoupon(requestList,memberId);
        MemberCoupon memberCoupon = new MemberCoupon();
        if(CollectionUtils.isNotEmpty(memberCouponList)){
            memberCoupon = memberCouponList.get(Constants.ZERO);
            couponAmount = memberCoupon.getValidAmount();
            memberCouponService.calculateCouponRata(memberCoupon,goodsCalculateList,amount);
            orderPayConfirmResponse.setMemberCoupon(memberCoupon);
        }
        //积分抵扣金额
        //查询用户总积分
        Member member = memberMapper.selectById(memberId);
        //积分大于0 ä¸”大于可用积分配置项 æ‰å¯ä»¥ä½¿ç”¨
        if(member.getIntegral().compareTo(BigDecimal.ZERO)>Constants.ZERO){
            //最低可用启用积分
            BigDecimal minimumIntegral = new BigDecimal(systemDictDataBiz.queryByCode(Constants.SHOP_CONFIG,Constants.MINIMUM_AVAILABLE_INTEGRAL).getCode());
            if(member.getIntegral().compareTo(minimumIntegral)>=Constants.ZERO){
                this.calculateIntegralRata(goodsCalculateList,member.getIntegral());
            }
        }
        //邮费金额
        if(Constants.equalsInteger(receiveType,Constants.ZERO)){
            //TODO  æ ¹æ®æ”¶è´§åœ°å€ æŸ¥è¯¢è¿è´¹é…ç½®

            //计算商品信息总重量
            BigDecimal totalWeight = goodsCalculateList.stream().map(i->
                    i.getWeight().multiply(new BigDecimal(i.getGoodsNum().toString()))
                    ).reduce(BigDecimal.ZERO,BigDecimal::add);
            
        }

        orderPayConfirmResponse.setAmount(amount);
        orderPayConfirmResponse.setCouponAmount(couponAmount);
        orderPayConfirmResponse.setDeductIntegral(deductIntegral);
        orderPayConfirmResponse.setMailAmount(mailAmount);
        orderPayConfirmResponse.setIntegralAmount(integralAmount);
        orderPayConfirmResponse.setPayAmount(amount.subtract(couponAmount).subtract(mailAmount).subtract(integralAmount));
        orderPayConfirmResponse.setGoodsCalculateList(goodsCalculateList);
        BigDecimal cashToIntegralRata = new BigDecimal(systemDictDataBiz.queryByCode(Constants.SHOP_CONFIG,Constants.CASH_EXCHANGE_INTEGRAL_RATA).getCode());
        orderPayConfirmResponse.setIntegralBack(
                orderPayConfirmResponse.getPayAmount().multiply(cashToIntegralRata)
        );

        return orderPayConfirmResponse;
    }

    /**
     *
     * @param goodsCalculateList å•†å“é›†åˆ
     * @param totalIntegral ç”¨æˆ·æ€»ç§¯åˆ†
     */
    public void  calculateIntegralRata(List<OrderGoodsCalculateResponse> goodsCalculateList,BigDecimal totalIntegral){
        //当前选择商品最大可用积分抵扣的金额
        BigDecimal maxDeductionCash =  goodsCalculateList.stream().map(i->i.getSkuAmount().subtract(i.getCouponDeductCash())
                .multiply(i.getDeductRata())).reduce(BigDecimal.ZERO,BigDecimal::add);
        //积分 - çŽ°é‡‘ æ¯”例
        BigDecimal cashToIntegralRata = new BigDecimal(systemDictDataBiz.queryByCode(Constants.SHOP_CONFIG,Constants.INTEGRAL_EXCHANGE_CASH_RATA).getCode());
        //当前选择商品抵扣需要使用的积分
        BigDecimal maxDeductionIntegral =  maxDeductionCash.multiply(cashToIntegralRata).multiply(new BigDecimal("100"));
        BigDecimal deductionRata = BigDecimal.ONE;
        //如果实际积分少于最大需要积分 éœ€è¦è®¡ç®—比例占比 åŽ»å¯¹åº”添加至对应的商品里
        if(totalIntegral.compareTo(maxDeductionIntegral)<=Constants.ZERO) {
            deductionRata = totalIntegral.divide(maxDeductionIntegral, 2, BigDecimal.ROUND_HALF_UP);
        }
        //获取总的抵扣金额 ä¸Ž æ¯ä¸ªå•†å“å¯æŠµæ‰£é‡‘额
        //已用占比比例值
        BigDecimal rata = BigDecimal.ZERO;
        //剩余可分配金额
        BigDecimal surplusValidAmount = maxDeductionCash;
        for (int j = 0; j < goodsCalculateList.size(); j++) {
            if(Constants.equalsInteger(j+1,goodsCalculateList.size())){
                goodsCalculateList.get(j).setIntegralMaxDeductCash(surplusValidAmount);
                goodsCalculateList.get(j).setOrderIntegralRata(new BigDecimal("1").subtract(rata));
            }else{
                //积分最大可抵扣金额
                goodsCalculateList.get(j).setIntegralMaxDeductCash(
                        goodsCalculateList.get(j).getSkuAmount()
                                .subtract(goodsCalculateList.get(j).getCouponDeductCash())
                                .multiply(goodsCalculateList.get(j).getDeductRata()));
                //订单中积分金额实际占比
                goodsCalculateList.get(j).setOrderIntegralRata(
                                goodsCalculateList.get(j)
                                        .getIntegralMaxDeductCash().divide(maxDeductionCash,2,BigDecimal.ROUND_DOWN)
                        );
                rata = rata.add(goodsCalculateList.get(j).getOrderIntegralRata());
                surplusValidAmount = surplusValidAmount.subtract(goodsCalculateList.get(j).getIntegralMaxDeductCash());
            }
            //如果用户积分大于本次需要使用的最大积分 åˆ™ç›´æŽ¥ä½¿ç”¨å¦åˆ™éœ€è¦é‡æ–°è®¡ç®—
            goodsCalculateList.get(j).setIntegralDeductCash(goodsCalculateList.get(j).getIntegralMaxDeductCash().multiply(deductionRata));
            goodsCalculateList.get(j).setIntegralDeduct(goodsCalculateList.get(j).getIntegralMaxDeductCash().multiply(cashToIntegralRata).multiply(deductionRata));
        }

    }




    /**
     * å‚¬å‘è´§
     * @param orderId
@@ -938,6 +1405,21 @@
        orderUrgeMapper.insert(orderUrge);
    }

    @Override
    public void delOrder(Integer orderId,Integer memberId){
        Goodsorder goodsorder = goodsorderMapper.selectById(orderId);
        if(!goodsorder.getMemberId().equals(memberId)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"操作失败：用户信息匹配失败！");
        }
        if(!goodsorder.getStatus().equals(Constants.OrderStatus.CLOSE.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"操作失败：当前订单状态，无法进行该操作！");
        }
        goodsorder.setIsdeleted(Constants.ONE);
        goodsorder.setEditDate(new Date());
        goodsorderMapper.updateById(goodsorder);
    }
    
    

    /**
     * è®¢å•ç¡®è®¤æ”¶è´§
@@ -950,6 +1432,9 @@
        if(!goodsorder.getMemberId().equals(memberId)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"操作失败：用户信息匹配失败！");
        }
        if(Constants.equalsInteger(goodsorder.getReceiveType(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"操作失败：自提订单，无法进行该操作！");
        }
        if(!goodsorder.getStatus().equals(Constants.OrderStatus.WAIT_RECEIVE.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"操作失败：订单未发货，无法进行确认！");
        }
@@ -959,7 +1444,69 @@
        goodsorder.setStatus(Constants.OrderStatus.DONE.getKey());
        goodsorder.setDoneDate(new Date());
        goodsorderMapper.updateById(goodsorder);
        //经销商分销 æ·»åŠ åˆ†é”€é‡‘额记录
        this.addShopIntegral(goodsorder);
    }

    /**
     * è®¢å•æ ¸é”€
     * @param code
     * @param memberId
     */
    @Override
    public void orderWriteOff(String exchangeCode,Integer memberId){
        Goodsorder goodsorder = goodsorderMapper.selectOne(new QueryWrapper<Goodsorder>().lambda()
                .eq(Goodsorder::getExchangeCode,exchangeCode)
                .eq(Goodsorder::getIsdeleted,Constants.ZERO).last("limit 1 "));
        if(Objects.isNull(goodsorder)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        if(!Constants.equalsInteger(goodsorder.getReceiveType(),Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"操作失败：配送订单，无法进行该操作！");
        }
        if(!goodsorder.getStatus().equals(Constants.OrderStatus.PAY_DONE.getKey())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"操作失败：订单状态已流转，无法进行该操作！");
        }
        Shop shop = shopMapper.selectById(goodsorder.getPickUpShopId());/*selectOne(new QueryWrapper<Shop>().lambda().eq(Shop::getMemberId,memberId)
                .eq(Shop::getIsdeleted,Constants.ZERO).last("limit 1 ")
        );*/
        if(Objects.isNull(shop)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到订单关联经销商信息,请联系管理员");
        }
        if(!Constants.equalsInteger(shop.getMemberId(),memberId)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"["+shop.getName()+"]非您绑定的经销商，无法进行该操作！");
        } 
        goodsorder.setStatus(Constants.OrderStatus.DONE.getKey());
        goodsorder.setDoneDate(new Date());
        goodsorderMapper.updateById(goodsorder);
        //经销商分销 æ·»åŠ åˆ†é”€é‡‘额记录
        this.addShopIntegral(goodsorder);
    }


    public void addShopIntegral(Goodsorder goodsorder){
        if(Objects.isNull(goodsorder.getDistributionShopId())){
            return;
        }
        List<GoodsorderDetail> detailList = goodsorderDetailMapper.selectList(new QueryWrapper<GoodsorderDetail>().lambda()
                .eq(GoodsorderDetail::getOrderId,goodsorder.getId())
                .isNotNull(GoodsorderDetail::getShopSettlement)
        );
        if(CollectionUtils.isNotEmpty(detailList)){
            BigDecimal settlement = detailList.stream().map(i->i.getShopSettlement()).reduce(BigDecimal.ZERO,BigDecimal::add);
            //更新余额信息 æ·»åŠ ç§¯åˆ†å˜åŠ¨è®°å½•
            DealIntegralRequest dealIntegralRequest = new DealIntegralRequest();
            dealIntegralRequest.setIntegralNum(settlement);
            dealIntegralRequest.setDealType(Constants.ZERO);
            dealIntegralRequest.setMemberId(goodsorder.getDistributionShopId());
            dealIntegralRequest.setObjId(goodsorder.getId());
            dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
            dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.SHOP_ORDER_SETTLEMENT);
            integralService.dealShopIntegral(dealIntegralRequest);
        }
    }




    @Override
@@ -1175,4 +1722,53 @@
    }




    @Override
    public HomeInfoResponse getHomeInfo(int memberId){
        HomeInfoResponse homeInfoResponse = new HomeInfoResponse();
        Member member = memberMapper.selectById(memberId);
        if(Objects.isNull(member)){
            return homeInfoResponse;
        }
        homeInfoResponse.setMember(member);
        homeInfoResponse.setWaitReceiveNum(
                goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda().eq(Goodsorder::getIsdeleted,Constants.ZERO)
                        .eq(Goodsorder::getMemberId,member.getId())
                        .eq(Goodsorder::getStatus,Constants.OrderStatus.WAIT_RECEIVE.getKey()))
        );
        homeInfoResponse.setWaitPayNum(
                goodsorderMapper.selectCount(new QueryWrapper<Goodsorder>().lambda().eq(Goodsorder::getIsdeleted,Constants.ZERO)
                        .eq(Goodsorder::getMemberId,member.getId())
                        .eq(Goodsorder::getStatus,Constants.OrderStatus.WAIT_PAY.getKey()))
        );
        homeInfoResponse.setCartTypeNum(
                shopcartMapper.selectCount(new QueryWrapper<Shopcart>().lambda()
                        .eq(Shopcart::getIsdeleted,Constants.ZERO)
                        .eq(Shopcart::getMemberId,member.getId()))
        );
        homeInfoResponse.setCouponNum(
                memberCouponMapper.selectCount(new QueryWrapper<MemberCoupon>().lambda()
                        .eq(MemberCoupon::getIsdeleted,Constants.ZERO)
                        .eq(MemberCoupon::getMemberId,member.getId())
                        .eq(MemberCoupon::getStatus,Constants.ZERO)
                        .apply(" end_date >now() ")
                )
        );
        homeInfoResponse.setCollectNum(
                collectMapper.selectCount(new QueryWrapper<Collect>().lambda()
                        .eq(Collect::getIsdeleted,Constants.ZERO)
                        .eq(Collect::getMemberId,member.getId())
                )
        );

        return homeInfoResponse;


    }





}

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/IntegralServiceImpl.java

@@ -10,10 +10,12 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.IntegralMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.ShopMapper;
import com.doumee.dao.business.join.IntegralJoinMapper;
import com.doumee.dao.business.model.Fund;
import com.doumee.dao.business.model.Integral;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.dto.IntegralDTO;
import com.doumee.dao.web.request.DealIntegralRequest;
import com.doumee.service.business.AreasService;
@@ -58,6 +60,9 @@

    @Autowired
    private MemberMapper memberMapper;

    @Autowired
    private ShopMapper shopMapper;

    @Transactional(rollbackFor = {Exception.class, BusinessException.class})
    @Override
@@ -150,6 +155,7 @@
        integral.setNum(dealIntegralRequest.getIntegralNum());
        integral.setTotalNum(dealIntegralRequest.getDealType().equals(Constants.ZERO)? member.getIntegral().add(integral.getNum()):member.getIntegral().subtract(integral.getNum()));
        integral.setOrderCode(dealIntegralRequest.getOrderCode());
        integral.setUserType(Constants.ZERO);
        integralMapper.insert(integral);
        if(dealIntegralRequest.getDealType().equals(Constants.ZERO)){
            memberMapper.addIntegral(member.getId(),dealIntegralRequest.getIntegralNum(),
@@ -160,7 +166,35 @@
        return integral.getId();
    }


    @Override
    @Transactional(rollbackFor = {Exception.class, BusinessException.class})
    public Integer dealShopIntegral(DealIntegralRequest dealIntegralRequest) {
        Shop shop = shopMapper.selectById(dealIntegralRequest.getMemberId());
        if(Objects.isNull(shop)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到商户信息");
        }
        Integral integral = new Integral();
        integral.setMemberId(shop.getId());
        integral.setCreateDate(new Date());
        integral.setIsdeleted(Constants.ZERO);
        integral.setTitle(dealIntegralRequest.getIntegralObjType().getName());
        integral.setContent(dealIntegralRequest.getIntegralObjType().getNoteinfo());
        integral.setObjId(dealIntegralRequest.getObjId());
        integral.setObjType(dealIntegralRequest.getIntegralObjType().getKey());
        integral.setType(dealIntegralRequest.getDealType());
        integral.setNum(dealIntegralRequest.getIntegralNum());
        integral.setTotalNum(dealIntegralRequest.getDealType().equals(Constants.ZERO)? shop.getIntegral().add(integral.getNum()):shop.getIntegral().subtract(integral.getNum()));
        integral.setOrderCode(dealIntegralRequest.getOrderCode());
        integral.setUserType(Constants.ONE);
        integralMapper.insert(integral);
        if(dealIntegralRequest.getDealType().equals(Constants.ZERO)){
            shopMapper.addIntegral(shop.getId(),dealIntegralRequest.getIntegralNum(),
                    dealIntegralRequest.getIntegralObjType().getAddTitle()==Constants.ZERO?dealIntegralRequest.getIntegralNum():BigDecimal.ZERO);
        }else{
            shopMapper.subtractIntegral(shop.getId(),dealIntegralRequest.getIntegralNum());
        }
        return integral.getId();
    }


    @Override

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberCouponServiceImpl.java

@@ -7,31 +7,33 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.ListUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CouponMapper;
import com.doumee.dao.business.MemberCouponJoinMapper;
import com.doumee.dao.business.MemberCouponMapper;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.dto.MemberCouponDTO;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.response.MemberCouponResponse;
import com.doumee.dao.web.response.goods.OrderGoodsCalculateResponse;
import com.doumee.service.business.MemberCouponService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

/**
 * ç”¨æˆ·ä¼˜æƒ åˆ¸å…³è”表Service实现
@@ -45,7 +47,17 @@
    private MemberCouponMapper memberCouponMapper;

    @Autowired
    private GoodsMapper goodsMapper;

    @Autowired
    private GoodsSkuMapper goodsSkuMapper;

    @Autowired
    private MemberCouponJoinMapper memberCouponJoinMapper;

    @Autowired
    private LabelsMapper labelsMapper;


    @Autowired
    private CouponMapper couponMapper;
@@ -196,11 +208,13 @@
     * @return
     */
    @Override
    public IPage<CouponDTO> memberCouponPage(IPage pages, BigDecimal price, Integer memberId,Integer couponType) {
        IPage<CouponDTO> page = memberCouponMapper.memberCouponPage(pages,new QueryWrapper<CouponDTO>()
    public IPage<MemberCouponResponse> memberCouponPage(IPage pages, BigDecimal price, Integer memberId,Integer couponType,Integer status) {
        IPage<MemberCouponResponse> page = memberCouponMapper.memberCouponPage(pages,new QueryWrapper<MemberCouponResponse>()
                .eq("m.MEMBER_ID",memberId)
                .eq("m.TYPE",Constants.ONE)
                .eq("m.STATUS",Constants.ZERO)
                .apply(Objects.nonNull(status)&&Constants.equalsInteger(status,Constants.ZERO),"m.STATUS = 0 and m.END_DATE >= now()" )
                .apply(Objects.nonNull(status)&&Constants.equalsInteger(status,Constants.ONE),"m.STATUS = 1" )
                .apply(Objects.nonNull(status)&&Constants.equalsInteger(status,Constants.TWO),"m.STATUS = 0 and  m.END_DATE < now() " )
                .eq("TYPE",couponType)
                .apply(!Objects.isNull(price)," m.LIMIT_PRICE >= "+price+" ")
                .apply("   now() between m.START_DATE and m.END_DATE ")
@@ -208,6 +222,41 @@
        );
        return page;
    }


    @Override
    public MemberCouponResponse getMemberCouponDetail(Integer id){
        MemberCoupon memberCoupon = memberCouponJoinMapper.selectById(id);
        if(Objects.isNull(memberCoupon)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        MemberCouponResponse memberCouponResponse = new MemberCouponResponse();
        BeanUtils.copyProperties(memberCoupon,memberCouponResponse);
        if(StringUtils.isNotBlank(memberCouponResponse.getApplyIds())){
            if(Constants.equalsInteger(memberCouponResponse.getApplyType(),Constants.ONE)){
                List<Labels> labelsList = labelsMapper.selectList(new QueryWrapper<Labels>().lambda()
                        .eq(Labels::getIsdeleted,Constants.ZERO)
                        .eq(Labels::getType,Constants.LabelsType.GOODSTYPE.getKey())
                        .apply(" find_in_set( id , '"+memberCouponResponse.getApplyIds()+"'  ) ")
                );
                if(CollectionUtils.isNotEmpty(labelsList)){
                    memberCouponResponse.setRelationInfoList(labelsList.stream().map(i->i.getName()).collect(Collectors.toList()));
                }
            }else if(Constants.equalsInteger(memberCouponResponse.getApplyType(),Constants.TWO)){
                List<Goods> labelsList = goodsMapper.selectList(new QueryWrapper<Goods>().lambda()
                        .eq(Goods::getIsdeleted,Constants.ZERO)
                        .apply(" find_in_set( id , '"+memberCouponResponse.getApplyIds()+"'  ) ")
                );
                if(CollectionUtils.isNotEmpty(labelsList)){
                    memberCouponResponse.setRelationInfoList(labelsList.stream().map(i->i.getName()).collect(Collectors.toList()));
                }
            }
        }

        return memberCouponResponse;
    }



    /**
     * ä¼˜æƒ åˆ¸æ•°é‡
@@ -220,7 +269,6 @@
    public long memberCouponNum( BigDecimal price, Integer memberId,Integer couponType) {
        long count = memberCouponMapper.selectCount(new QueryWrapper<MemberCoupon>()
                .eq("MEMBER_ID",memberId)
                .eq("TYPE",Constants.ONE)
                .eq("STATUS",Constants.ZERO)
                .eq("TYPE",couponType)
                .apply("LIMIT_PRICE >= "+price+" ")
@@ -317,4 +365,152 @@
    }


    /**
     * æ ¹æ®å•†å“ä¿¡æ¯èŽ·å–适用的优惠券
     */
    @Override
    public List<MemberCoupon> getApplyCoupon(List<PayDetailRequest> requestList,Integer memberId){
        List<MemberCoupon> memberCouponList = new ArrayList<>();
        List<GoodsSku> goodsSkuList = goodsSkuMapper.selectList(new QueryWrapper<GoodsSku>()
                .lambda()
                .eq(GoodsSku::getIsdeleted,Constants.ZERO)
                .in(GoodsSku::getId,requestList.stream().map(i->i.getGoodsSkuId()).collect(Collectors.toList()))
        );
        if(CollectionUtils.isEmpty(goodsSkuList)||!Constants.equalsInteger(goodsSkuList.size(),requestList.size())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"商品SKU信息错误,请刷新重试");
        }

        //查询商品列表
        List<Goods> goodsList = goodsMapper.selectJoinList(Goods.class,
                new MPJLambdaWrapper<Goods>()
                        .selectAs(GoodsSku::getPrice,Goods::getSkuPrice)
                        .selectAs(GoodsSku::getId,Goods::getSkuId)
                        .leftJoin(GoodsSku.class,GoodsSku::getGoodsId,Goods::getId)
                .in(GoodsSku::getId,requestList.stream().map(i->i.getGoodsSkuId()).collect(Collectors.toList())));

        if(Objects.isNull(goodsList)){
            return memberCouponList;
        }

        //获取选择的商品总金额 ä¸Ž å•ä¸ªå•†å“é‡‘额
        BigDecimal totalAmount = BigDecimal.ZERO;
        for (Goods goods:goodsList) {
            List<PayDetailRequest> request = requestList.stream().filter(i->Constants.equalsInteger(i.getGoodsSkuId(), goods.getSkuId())).collect(Collectors.toList());
            if(CollectionUtils.isNotEmpty(request)){
                goods.setSkuAmount(goods.getSkuPrice().multiply(new BigDecimal(request.get(Constants.ZERO).getGoodsNum()+"")));
                totalAmount = totalAmount.add(goods.getSkuAmount());
            }
        }
        List<OrderGoodsCalculateResponse> goodsCalculateList = ListUtil.copyProperties(goodsList,OrderGoodsCalculateResponse::new);
        //获取所有满足金额且可用的优惠券
        List<MemberCoupon> allCoupon =  memberCouponMapper.selectList(new QueryWrapper<MemberCoupon>().lambda()
                        .eq(MemberCoupon::getIsdeleted,Constants.ZERO)
                        .eq(MemberCoupon::getStatus,Constants.ZERO)
                        .apply("  LIMIT_PRICE <= " + totalAmount)
                        .apply("  now() between START_DATE and  END_DATE "));

        if(CollectionUtils.isNotEmpty(allCoupon)){
            for (MemberCoupon memberCoupon:allCoupon) {
                //适用类型：0=全场;1=品类；2=指定商品
                 if(Constants.equalsInteger(memberCoupon.getApplyType(),Constants.ZERO)){
                     memberCoupon.setValidAmount(memberCoupon.getPrice());
                 }else{
                     List<String> applyIdList = Arrays.asList(memberCoupon.getApplyIds().split(","));
                     //获取有效可以使用优惠券的数据
                     isVaildUse(applyIdList,goodsCalculateList,
                             Constants.equalsInteger(memberCoupon.getApplyType(),Constants.ONE)?Constants.ONE:Constants.ZERO);
                     BigDecimal skuAmount = goodsCalculateList.stream().filter(i->i.getUseCoupon()).map(i->i.getSkuAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
                     if(skuAmount.compareTo(memberCoupon.getLimitPrice())>=Constants.ZERO){
                         //根据金额计算实际折扣金额
                         BigDecimal couponPrice = skuAmount.multiply(memberCoupon.getPrice()).divide(new BigDecimal("100"),2, RoundingMode.HALF_UP);
                         //折扣金额大于最大可折扣金额  åˆ™ä½¿ç”¨æœ€å¤§å¯æŠ˜æ‰£é‡‘额
                         memberCoupon.setValidAmount(couponPrice.compareTo(memberCoupon.getMaxPrice())>Constants.ZERO?memberCoupon.getMaxPrice():couponPrice);
                         memberCouponList.add(memberCoupon);
                     }
                 }
            }
        }
        // ä½¿ç”¨ Stream æŽ’序  reversed() è¡¨ç¤ºå€’序
        memberCouponList = memberCouponList.stream().sorted(Comparator.comparing(MemberCoupon::getValidAmount,Comparator.nullsFirst(BigDecimal::compareTo)).reversed())
                .collect(Collectors.toList());
        return memberCouponList;
    }


    /**
     * è®¡ç®—当前已选择优惠券每个商品占比金额
     * @param coupon ä¼˜æƒ åˆ¸ä¿¡æ¯
     * @param goodsCalculateList å•†å“é›†åˆ
     * @param totalAmount è®¢å•æ€»é‡‘额
     */
    public void  calculateCouponRata(MemberCoupon coupon,List<OrderGoodsCalculateResponse> goodsCalculateList,BigDecimal totalAmount){
        //总余额
        BigDecimal validAmount = coupon.getValidAmount();
        //剩余可分配金额
        BigDecimal surplusValidAmount = validAmount;
        //已用占比比例值
        BigDecimal rata = BigDecimal.ZERO;
        //根据优惠券类型 è®¡ç®—可以使用优惠券的商品信息 é€‚用类型：0=全场;1=品类；2=指定商品
        if(!Constants.equalsInteger(coupon.getApplyType(),Constants.ZERO)){
            List<String> applyIdList = Arrays.asList(coupon.getApplyIds().split(","));
            isVaildUse(applyIdList,goodsCalculateList,
                    Constants.equalsInteger(coupon.getApplyType(),Constants.ONE)?Constants.ONE:Constants.ZERO);
        }
        //使用了优惠券的商品数量
        Integer countCouponNum = goodsCalculateList.stream().filter(i->i.getUseCoupon()).collect(Collectors.toList()).size();
        Integer useCouponNum = Constants.ZERO;
        for (int i = 0; i < goodsCalculateList.size(); i++) {
            if(!goodsCalculateList.get(i).getUseCoupon()){
                goodsCalculateList.get(i).setCouponDeductCash(BigDecimal.ZERO);
                continue;
            }
            if(Constants.equalsInteger(useCouponNum+1,countCouponNum)){
                goodsCalculateList.get(i).setOrderCouponRata(new BigDecimal("1").subtract(rata));
                goodsCalculateList.get(i).setCouponDeductCash(surplusValidAmount);
                break;
            }
            goodsCalculateList.get(i).setOrderCouponRata(goodsCalculateList.get(i).getSkuAmount().divide(totalAmount,2,BigDecimal.ROUND_DOWN));
            goodsCalculateList.get(i).setCouponDeductCash(validAmount.multiply(goodsCalculateList.get(i).getOrderCouponRata()));
            surplusValidAmount = surplusValidAmount.subtract(goodsCalculateList.get(i).getCouponDeductCash());
            rata = rata.add(goodsCalculateList.get(i).getOrderCouponRata());
            useCouponNum = useCouponNum + 1;
        }
    }





    /**
     * åˆ¤æ–­æ˜¯å¦å¯ä»¥æœ‰æ•ˆä½¿ç”¨
     * @param idList
     * @param goodsList
     * @param vaildType 0=商品；1=品类
     * @return
     */
    public void isVaildUse(List<String> idList,List<OrderGoodsCalculateResponse> goodsList,Integer vaildType){
        for (OrderGoodsCalculateResponse response:goodsList) {
            response.setUseCoupon(idList.contains(Constants.equalsInteger(vaildType,Constants.ZERO)?response.getId().toString():response.getCategoryId().toString())?true:false);
        }
    }
//    public Set<Integer> isVaildUse(List<String> idList,List<OrderGoodsCalculateResponse> goodsList,Integer vaildType){
//        List<OrderGoodsCalculateResponse> resultList = new ArrayList<>();
//        for (String id:idList) {
//            if(Constants.equalsInteger(vaildType,Constants.ZERO)){
//                resultList.addAll(goodsList.stream().filter(i->i.getId().toString().equals(id)).collect(Collectors.toList()));
//            }else{
//                resultList.addAll(goodsList.stream().filter(i->i.getCategoryId().toString().equals(id)).collect(Collectors.toList()));
//            }
//        }
//        if(CollectionUtils.isNotEmpty(resultList)){
//            return new HashSet<>(resultList.stream().map(i->i.getId()).collect(Collectors.toList()));
//        }
//        return new HashSet<>();
//    }






}

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java

@@ -20,16 +20,19 @@
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.SmsrecordMapper;
import com.doumee.dao.business.join.MemberJoinMapper;
import com.doumee.dao.business.model.Areas;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Smsrecord;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.MemberRechargeDTO;
import com.doumee.dao.web.dto.MemberOwnDTO;
import com.doumee.dao.web.dto.shop.Position;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.request.DealIntegralRequest;
import com.doumee.dao.web.request.UpdMobileRequest;
import com.doumee.dao.web.request.UpdateMemberRequest;
import com.doumee.dao.web.request.WxPhoneRequest;
import com.doumee.dao.web.response.AccountResponse;
@@ -74,6 +77,9 @@

    @Autowired
    private MemberMapper memberMapper;

    @Autowired
    private SmsrecordMapper smsrecordMapper;


    @Autowired
@@ -328,6 +334,12 @@

    @Override
    public Member updateMember(UpdateMemberRequest updateMemberRequest){
        if(StringUtils.isBlank(updateMemberRequest.getImgurl())
                && StringUtils.isBlank(updateMemberRequest.getNickname())
                && StringUtils.isBlank(updateMemberRequest.getName())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Member member  = new Member();
        BeanUtils.copyProperties(updateMemberRequest,member);
        member.setId(updateMemberRequest.getMemberId());
@@ -339,6 +351,9 @@
                systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+dbMember.getImgurl());
        return dbMember;
    }




    @Override
    public MemberOwnDTO getMemberOwnDTO(Integer memberId) {
@@ -405,6 +420,68 @@
        memberMapper.updateById(member);
    }

    @Override
    public void verifyUserPhone(UpdMobileRequest request){
        if(Objects.isNull(request)
                || Objects.isNull(request.getMemberId())
                || StringUtils.isBlank(request.getPhone())
                || StringUtils.isBlank(request.getCode())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Member member = memberMapper.selectById(request.getMemberId());
        if(StringUtils.isNotBlank(member.getPhone())&&!member.getPhone().equals(request.getPhone())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"手机号错误");
        }
        this.verifyPhoneCode(request.getCode(),request.getMemberId());
    }

    public void verifyPhoneCode(String code,Integer memberId){
        //验证码
        Smsrecord smsrecord = smsrecordMapper.selectOne(new QueryWrapper<Smsrecord>().lambda()
                .eq(Smsrecord::getIsdeleted,Constants.ZERO)
                .eq(Smsrecord::getCode,code)
                .eq(Smsrecord::getMemberId,memberId)
                .last(" limit 1")
        );
        if(Objects.isNull(smsrecord)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"验证码错误！");
        }
        if(!Constants.equalsInteger(smsrecord.getStatus(),Constants.ZERO)){
            if(Constants.equalsInteger(smsrecord.getStatus(),Constants.ONE)){
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"验证码已使用");
            }else{
                throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"验证码已过期");
            }
        }
        smsrecordMapper.update(new UpdateWrapper<Smsrecord>().lambda()
                .set(Smsrecord::getStatus,Constants.ONE)
                .eq(Smsrecord::getId,smsrecord.getId())
        );
    }

    @Override
    public void updateUserPhone(UpdMobileRequest request){
        if(Objects.isNull(request)
        || Objects.isNull(request.getMemberId())
        || StringUtils.isBlank(request.getPhone())
        || StringUtils.isBlank(request.getCode())
        ){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        Member member = memberMapper.selectById(request.getMemberId());
        if(StringUtils.isNotBlank(member.getPhone())&&member.getPhone().equals(request.getPhone())){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"无法更换相同手机号");
        }
        this.verifyPhoneCode(request.getCode(),request.getMemberId());
        memberMapper.update(new UpdateWrapper<Member>().lambda()
                .eq(Member::getPhone,request.getPhone())
                .eq(Member::getId,request.getMemberId())
        );
    }



    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    @Override
    public Integer importMemberRechargeBatch(MultipartFile file) {

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopGoodsRelationServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,139 @@
package com.doumee.service.business.impl;

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.ShopGoodsRelationMapper;
import com.doumee.dao.business.model.ShopGoodsRelation;
import com.doumee.service.business.ShopGoodsRelationService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;

/**
 * ç»é”€å•†ä¾›è´§ä»·ä¿¡æ¯Service实现
 * @author æ±Ÿè¹„蹄
 * @date 2025/12/15 09:39
 */
@Service
public class ShopGoodsRelationServiceImpl implements ShopGoodsRelationService {

    @Autowired
    private ShopGoodsRelationMapper shopGoodsRelationMapper;

    @Override
    public Integer create(ShopGoodsRelation shopGoodsRelation) {
        shopGoodsRelationMapper.insert(shopGoodsRelation);
        return shopGoodsRelation.getId();
    }

    @Override
    public void deleteById(Integer id) {
        shopGoodsRelationMapper.deleteById(id);
    }

    @Override
    public void delete(ShopGoodsRelation shopGoodsRelation) {
        UpdateWrapper<ShopGoodsRelation> deleteWrapper = new UpdateWrapper<>(shopGoodsRelation);
        shopGoodsRelationMapper.delete(deleteWrapper);
    }

    @Override
    public void deleteByIdInBatch(List<Integer> ids) {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        shopGoodsRelationMapper.deleteBatchIds(ids);
    }

    @Override
    public void updateById(ShopGoodsRelation shopGoodsRelation) {
        shopGoodsRelationMapper.updateById(shopGoodsRelation);
    }

    @Override
    public void updateByIdInBatch(List<ShopGoodsRelation> shopGoodsRelations) {
        if (CollectionUtils.isEmpty(shopGoodsRelations)) {
            return;
        }
        for (ShopGoodsRelation shopGoodsRelation: shopGoodsRelations) {
            this.updateById(shopGoodsRelation);
        }
    }

    @Override
    public ShopGoodsRelation findById(Integer id) {
        return shopGoodsRelationMapper.selectById(id);
    }

    @Override
    public ShopGoodsRelation findOne(ShopGoodsRelation shopGoodsRelation) {
        QueryWrapper<ShopGoodsRelation> wrapper = new QueryWrapper<>(shopGoodsRelation);
        return shopGoodsRelationMapper.selectOne(wrapper);
    }

    @Override
    public List<ShopGoodsRelation> findList(ShopGoodsRelation shopGoodsRelation) {
        QueryWrapper<ShopGoodsRelation> wrapper = new QueryWrapper<>(shopGoodsRelation);
        return shopGoodsRelationMapper.selectList(wrapper);
    }
  
    @Override
    public PageData<ShopGoodsRelation> findPage(PageWrap<ShopGoodsRelation> pageWrap) {
        IPage<ShopGoodsRelation> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<ShopGoodsRelation> queryWrapper = new QueryWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(ShopGoodsRelation::getId, pageWrap.getModel().getId());
        }
        if (pageWrap.getModel().getCreator() != null) {
            queryWrapper.lambda().eq(ShopGoodsRelation::getCreator, pageWrap.getModel().getCreator());
        }
        if (pageWrap.getModel().getCreateDate() != null) {
            queryWrapper.lambda().ge(ShopGoodsRelation::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
            queryWrapper.lambda().le(ShopGoodsRelation::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
        }
        if (pageWrap.getModel().getEditor() != null) {
            queryWrapper.lambda().eq(ShopGoodsRelation::getEditor, pageWrap.getModel().getEditor());
        }
        if (pageWrap.getModel().getEditDate() != null) {
            queryWrapper.lambda().ge(ShopGoodsRelation::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
            queryWrapper.lambda().le(ShopGoodsRelation::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
        }
        if (pageWrap.getModel().getIsdeleted() != null) {
            queryWrapper.lambda().eq(ShopGoodsRelation::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.lambda().eq(ShopGoodsRelation::getRemark, pageWrap.getModel().getRemark());
        }
        if (pageWrap.getModel().getShopId() != null) {
            queryWrapper.lambda().eq(ShopGoodsRelation::getShopId, pageWrap.getModel().getShopId());
        }
        if (pageWrap.getModel().getGoodsSkuId() != null) {
            queryWrapper.lambda().eq(ShopGoodsRelation::getGoodsSkuId, pageWrap.getModel().getGoodsSkuId());
        }
        if (pageWrap.getModel().getPrice() != null) {
            queryWrapper.lambda().eq(ShopGoodsRelation::getPrice, pageWrap.getModel().getPrice());
        }
        for(PageWrap.SortData sortData: pageWrap.getSorts()) {
            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
                queryWrapper.orderByDesc(sortData.getProperty());
            } else {
                queryWrapper.orderByAsc(sortData.getProperty());
            }
        }
        return PageData.from(shopGoodsRelationMapper.selectPage(page, queryWrapper));
    }

    @Override
    public long count(ShopGoodsRelation shopGoodsRelation) {
        QueryWrapper<ShopGoodsRelation> wrapper = new QueryWrapper<>(shopGoodsRelation);
        return shopGoodsRelationMapper.selectCount(wrapper);
    }
}

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopcartServiceImpl.java

@@ -181,6 +181,19 @@
        return page;
    }

    /**
     * è´­ç‰©è½¦å•†å“æ•°é‡
     * @param memberId
     * @return
     */
    @Override
    public Integer cartGoodsTypeNum(Integer memberId) {
        return shopcartMapper.selectList(new QueryWrapper<Shopcart>().lambda()
                .eq(Shopcart::getMemberId,memberId)
                .eq(Shopcart::getIsdeleted,Constants.ZERO)
        ).size();
    }


    /**
     * æ›´æ–°è´­ç‰©è½¦æ•°é‡

 server/dmmall_service/src/main/resources/application-dev.yml

@@ -50,7 +50,7 @@
wx:
  pay:
    appId: wxcd2b89fd2ff065f8
    appSecret: 1ceb7c9dff3c4330d653adc3ca55ea24
    appSecret: 3462fa186da7cb06c544df8d8664b63a
    mchId: 1229817002
    mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
    notifyUrl: https://dmtest.ahapp.net/dmmall_interface/web/api/wxPayNotify

 server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java

@@ -56,6 +56,10 @@
    public GoodsorderService goodsorderService;

    @Autowired
    public ShopService shopService;


    @Autowired
    public GoodsorderDetailService goodsorderDetailService;

    @Autowired
@@ -74,8 +78,6 @@
    @Autowired
    public ArticleService articleService;

    @Autowired
    public ShopService shopService;

    @Autowired
    public ShopNewsService shopNewsService;

 server/dmmall_web/src/main/java/com/doumee/api/web/mall/HomeApi.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package com.doumee.api.web.mall;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.web.ApiController;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.web.request.PageRequest;
import com.doumee.dao.web.request.UpdMobileRequest;
import com.doumee.dao.web.response.HomeInfoResponse;
import com.doumee.dao.web.response.OrderDetailResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

/**
 * Created by IntelliJ IDEA.
 *
 * @Author : Rk
 * @create 2025/12/15 13:59
 */

@Api(tags = "个人中心")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/home")
@Slf4j
public class HomeApi extends ApiController {


    @LoginRequired
    @ApiOperation("我的信息")
    @GetMapping("/myInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<HomeInfoResponse> myInfo() {
        return ApiResponse.success("查询成功",goodsorderService.getHomeInfo(getMemberId()));
    }



    @LoginRequired
    @ApiOperation("验证手机号")
    @PostMapping("/verifyUserPhone")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse verifyUserPhone(@RequestBody UpdMobileRequest request) {
        memberService.verifyUserPhone(request);
        return ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation("更换绑定手机号")
    @PostMapping("/updateUserPhone")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse updateUserPhone(@RequestBody UpdMobileRequest request) {
        memberService.updateUserPhone(request);
        return ApiResponse.success("操作成功");
    }


}

 server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java

@@ -11,27 +11,36 @@
import com.doumee.core.wx.SendWxMessage;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.request.OrderPayRequest;
import com.doumee.dao.web.request.PageRequest;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.request.ShopOrderPayRequest;
import com.doumee.dao.web.request.goods.DealOrderRequest;
import com.doumee.dao.web.request.goods.MemberOrderRequest;
import com.doumee.dao.web.request.goods.OrderCommentRequest;
import com.doumee.dao.web.response.MemberCouponResponse;
import com.doumee.dao.web.response.MyPageResponse;
import com.doumee.dao.web.response.OrderCommentResponse;
import com.doumee.dao.web.response.OrderDetailResponse;
import com.doumee.dao.web.response.goods.MemberOrderResponse;
import com.doumee.dao.web.response.goods.PayResponse;
import com.doumee.service.business.HotCityService;
import com.doumee.service.business.impl.MemberCouponServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

/**
 * Created by IntelliJ IDEA.
@@ -82,25 +91,63 @@
            @ApiImplicitParam(paramType = "query", dataType = "Long", name = "current", value = "页码", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Long", name = "size", value = "每页记录数", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "couponType", value = "优惠券类别：0商家优惠券 1平台优惠券", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "limitPrice", value = "满额", required = false)
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "limitPrice", value = "满额", required = false),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "status", value = "状态：0=未使用;1=已使用；2=已过期", required = false)
    })
    public ApiResponse<IPage<CouponDTO>> memberCouponPage(PageRequest pageable, Integer couponType, BigDecimal limitPrice) {
        IPage<CouponDTO> page = memberCouponService.memberCouponPage(pageable.toPage(),limitPrice,getMemberId(),couponType);
    public ApiResponse<IPage<MemberCouponResponse>> memberCouponPage(PageRequest pageable, Integer couponType, BigDecimal limitPrice, Integer status) {
        IPage<MemberCouponResponse> page = memberCouponService.memberCouponPage(pageable.toPage(),limitPrice,getMemberId(),couponType,status);
        return ApiResponse.success("查询成功",page);
    }

    @LoginRequired
    @ApiOperation("可用优惠券数量")
    @GetMapping("/memberCouponNum")
    @ApiOperation("会员优惠券详情")
    @GetMapping("/memberCouponDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "couponType", value = "优惠券类别", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "limitPrice", value = "满额", required = true)
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "主键", required = true)
    })
    public ApiResponse<Long> memberCouponNum(Integer couponType, BigDecimal limitPrice) {
        return ApiResponse.success("查询成功", memberCouponService.memberCouponNum(limitPrice,getMemberId(),couponType));
    public ApiResponse<MemberCouponResponse> memberCouponDetail(Integer id) {
        return ApiResponse.success("查询成功",memberCouponService.getMemberCouponDetail(id));
    }


//    @LoginRequired
//    @ApiOperation("可用优惠券数量")
//    @GetMapping("/memberCouponNum")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "couponType", value = "优惠券类别", required = true),
//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "limitPrice", value = "满额", required = true)
//    })
//    public ApiResponse<Integer> memberCouponNum(Integer couponType, BigDecimal limitPrice) {
//        return ApiResponse.success("查询成功", memberCouponService.memberCouponNum(limitPrice,getMemberId(),couponType));
//    }



    @LoginRequired
    @ApiOperation("可用优惠券信息")
    @PostMapping("/getApplyCoupon")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<List<MemberCoupon>> getApplyCoupon(@RequestBody List<PayDetailRequest> requestList) {
        return ApiResponse.success("查询成功", memberCouponService.getApplyCoupon(requestList,getMemberId()));
    }

    @LoginRequired
    @ApiOperation("经销商列表")
    @PostMapping("/shopPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<IPage<Shop>> shopPage(@RequestBody PageWrap<Shop> pageWrap) {
        IPage<Shop> page = goodsorderService.getShopPage(pageWrap);
        return ApiResponse.success("查询成功",page);
    }

    @Autowired
    public MemberCouponServiceImpl memberCouponServiceImpl;

    @LoginRequired
    @ApiOperation("订单支付")
@@ -108,9 +155,9 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<PayResponse> orderPay(@Valid @RequestBody  OrderPayRequest orderPayRequest) {
        orderPayRequest.setMemberId(getMemberId());
        return ApiResponse.success("操作成功", goodsorderService.orderPay(orderPayRequest));
    public ApiResponse<PayResponse> orderPay(@Valid @RequestBody  ShopOrderPayRequest request) {
        request.setMemberId(getMemberId());
        return ApiResponse.success("操作成功", goodsorderService.orderPay(request, memberCouponServiceImpl));
    }

    @LoginRequired
@@ -135,7 +182,7 @@
    }

    @LoginRequired
    @ApiOperation("我的订单列表")
    @ApiOperation("订单列表")
    @PostMapping("/orderPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
@@ -165,7 +212,7 @@
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse cancelOrder(@RequestBody DealOrderRequest dealOrderRequest) {
        goodsorderService.cancelOrder(dealOrderRequest.getOrderId(),getMemberId(),dealOrderRequest.getCancelInfo());
        goodsorderService.cancelOrderNew(dealOrderRequest.getOrderId(),getMemberId(),dealOrderRequest.getCancelInfo());
        return ApiResponse.success("操作成功");
    }

@@ -193,6 +240,30 @@


    @LoginRequired
    @ApiOperation("订单核销")
    @PostMapping("/writeOffOrder")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse writeOffOrder(@RequestBody DealOrderRequest dealOrderRequest) {
        goodsorderService.orderWriteOff(dealOrderRequest.getExchangeCode(),getMemberId());
        return ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation("订单删除")
    @PostMapping("/delOrder")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse delOrder(@RequestBody DealOrderRequest dealOrderRequest) {
        goodsorderService.delOrder(dealOrderRequest.getOrderId(),getMemberId());
        return ApiResponse.success("操作成功");
    }



    @LoginRequired
    @ApiOperation("订单评论")
    @PostMapping("/orderComment")
    @ApiImplicitParams({

 server/dmmall_web/src/main/java/com/doumee/api/web/mall/PaymentCallback.java

@@ -100,6 +100,41 @@
                        fundService.create(fund);
                        break;
                    }
                    case "shopGoods": {
                        Goodsorder DBGoodsOrder = new Goodsorder();
                        DBGoodsOrder.setCode(Long.valueOf(outTradeNo));
                        Goodsorder goodsOrder = goodsorderService.findOne(DBGoodsOrder);
                        if(Objects.isNull(goodsOrder)){
                            return WxPayNotifyResponse.fail( "支付回调信息("+ wxId + ") = > æœªæŸ¥è¯¢åˆ°æ”¯ä»˜å¯¹è±¡ä¿¡æ¯!");
                        }
                        if(goodsOrder.getStatus().equals(Constants.ONE)){
                            return WxPayNotifyResponse.success("处理成功!");
                        }
                        goodsOrder.setPayStatus(Constants.ONE);
                        goodsOrder.setPayDate(new Date());
                        goodsOrder.setPayOrderId(paymentNo);
                        goodsOrder.setStatus(Constants.OrderStatus.PAY_DONE.getKey());
                        //生成核销码
                        goodsOrder.setExchangeCode(Constants.equalsInteger(goodsOrder.getReceiveType(),Constants.ZERO)?null:Constants.getRandomNumber());
                        goodsOrder.setPayMethod(Constants.ZERO);
                        goodsorderService.updateById(goodsOrder);
                        Fund fund = new Fund();
                        fund.setOrderCode(goodsOrder.getPayOrderId());
                        fund.setCreator(goodsOrder.getMemberId());
                        fund.setCreateDate(new Date());
                        fund.setIsdeleted(Constants.ZERO);
                        fund.setRemark(goodsOrder.getCode().toString());
                        fund.setMemberId(goodsOrder.getMemberId());
                        fund.setTitle("订单支付");
                        fund.setContent("订单支付");
                        fund.setObjId(goodsOrder.getId());
                        fund.setObjType(Constants.ONE);
                        fund.setType(Constants.ZERO);
                        fund.setNum(goodsOrder.getPrice());
                        fundService.create(fund);
                        break;
                    }

                }
                return WxPayNotifyResponse.success("处理成功!");
            }

 server/dmmall_web/src/main/java/com/doumee/api/web/mall/ShopCartApi.java

@@ -48,6 +48,17 @@
    }

    @LoginRequired
    @ApiOperation("购物车列表")
    @GetMapping("/cartGoodsTypeNum")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<Integer> cartGoodsTypeNum() {
        return ApiResponse.success("查询成功",shopcartService.cartGoodsTypeNum(getMemberId()));
    }


    @LoginRequired
    @ApiOperation("批量删除")
    @GetMapping("/deleteBatch")
    @ApiImplicitParams({