20210412 tqq环境

xiaoyong931011

2021-04-12 a13a93a493e7e94e28b2225c26e7e13b52d3288c

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WXShopOrderService.java

@@ -1,15 +1,12 @@
package com.matrix.system.shopXcx.api.service;

import com.matrix.core.pojo.AjaxResult;
import com.matrix.component.wechat.externalInterface.protocol.paramProtocol.BrandWCPayRequestData;
import com.matrix.system.shopXcx.bean.ShopOrder;
import com.matrix.system.shopXcx.dto.DiscountExplain;
import com.matrix.system.shopXcx.api.pojo.AddShopOrderPOJO;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.system.shopXcx.api.pojo.OrderInfoQueryPOJO;
import com.matrix.system.shopXcx.api.vo.ShopCartVo;
import com.matrix.system.shopXcx.api.pojo.ShopOrderDto;
import com.matrix.system.shopXcx.bean.ShopOrder;

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

/**
 * @author jyy
@@ -22,11 +19,11 @@

    /**
     * 创建订单
     * @param addShopOrderPOJO
     * @param shopOrderDto
     * @return
     * @throws Exception
     */
    AjaxResult createShopOrder(AddShopOrderPOJO addShopOrderPOJO) throws Exception;
    AjaxResult createShopOrder(ShopOrderDto shopOrderDto) throws Exception;

    /**
     * 订单结算
@@ -93,5 +90,5 @@
     */
    AjaxResult updateStockAndVolumeById(Integer orderId);

    DiscountExplain buildDiscountExplain(List<ShopCartVo> cartList, Integer id, Long companyId);
    AjaxResult buildDiscountExplain(ShopOrderDto shopOrderDto);
}