clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

规范化订单商品表内关联字段，修改订单list接口

This commit is contained in:
kuang.yifei@iwhalecloud.com 2022-06-09 15:11:02 +08:00
parent 6f37b29eb7
commit 0feed790ce
8 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -113,7 +113,7 @@ public class OrderController extends BaseController {
// 批量生成订单商品 // 批量生成订单商品
request.getGoodsList().forEach(goods -> { request.getGoodsList().forEach(goods -> {
OrderGoods orderGoods = new OrderGoods(); OrderGoods orderGoods = new OrderGoods();
orderGoods.setGoodsId(goods.getGoodsStandardId()); orderGoods.setGoodsStandardId(goods.getGoodsStandardId());
orderGoods.setGoodsNum(goods.getNum()); orderGoods.setGoodsNum(goods.getNum());
orderGoods.setOrderId(od.getId()); orderGoods.setOrderId(od.getId());
orderGoods.setServerGoodsNum(0); orderGoods.setServerGoodsNum(0);

23
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -12,6 +12,7 @@ import com.ghy.customer.domain.Customer;
import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.domain.CustomerAddress;
import com.ghy.customer.service.CustomerAddressService; import com.ghy.customer.service.CustomerAddressService;
import com.ghy.customer.service.CustomerService; import com.ghy.customer.service.CustomerService;
import com.ghy.goods.domain.Goods;
import com.ghy.goods.domain.GoodsStandard; import com.ghy.goods.domain.GoodsStandard;
import com.ghy.goods.service.GoodsService; import com.ghy.goods.service.GoodsService;
import com.ghy.goods.service.GoodsStandardService; import com.ghy.goods.service.GoodsStandardService;
@ -101,11 +102,13 @@ public class OrderMasterController extends BaseController {
// 师傅信息 // 师傅信息
Worker worker = workerService.selectById(master.getWorkerId()); Worker worker = workerService.selectById(master.getWorkerId());
// 商品信息 // 商品规格及信息
OrderGoods orderGoods = orderGoodsService.selectByOrderMasterId(master.getId()); List<OrderGoods> orderStandardList = orderGoodsService.selectByOrderMasterId(master.getId());
// 规格信息 // 商品信息
List<GoodsStandard> goodsStandardList = goodsStandardService.selectByGoodsStandardId(orderGoods.getGoodsId()); GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId());
Goods goods = goodsService.selectById(goodsStandard.getGoodsId());
// 财务信息 // 财务信息
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(master.getId()); FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(master.getId());
@ -113,17 +116,17 @@ public class OrderMasterController extends BaseController {
// 地址信息 // 地址信息
CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId()); CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
for(GoodsStandard goodsStandard : goodsStandardList){ for(OrderGoods orderGoods : orderStandardList){
OrderStandard orderStandard = new OrderStandard(); OrderStandard orderStandard = new OrderStandard();
orderStandard.setStandardName(goodsStandard.getGoodsStandardName()); orderStandard.setStandardName(orderGoods.getGoodsName());
orderStandard.setStandardNum(goodsStandard.getGoodsNum()); orderStandard.setStandardNum(orderGoods.getGoodsNum());
standardList.add(orderStandard); standardList.add(orderStandard);
} }
// 编辑返回属性 // 编辑返回属性
orderListResponse.setOrderMasterId(master.getId()); orderListResponse.setOrderMasterId(master.getId());
orderListResponse.setGoodsName(orderGoods.getGoodsName()); orderListResponse.setGoodsName(goods.getGoodsName());
orderListResponse.setGoodsLogoUrl(orderGoods.getGoodsLogoUrl()); orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl());
orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney()); orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
orderListResponse.setTotalMoney(financialMaster.getTotalMoney()); orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
orderListResponse.setPayMoney(financialMaster.getPayMoney()); orderListResponse.setPayMoney(financialMaster.getPayMoney());
@ -199,7 +202,7 @@ public class OrderMasterController extends BaseController {
Map<Long, FinancialDetail> longFinancialDetailMap = financialDetailService.byOrderIdInMap(orderDetailsIdList); Map<Long, FinancialDetail> longFinancialDetailMap = financialDetailService.byOrderIdInMap(orderDetailsIdList);
for(OrderGoods orderGoods : orderGoodsList){ for(OrderGoods orderGoods : orderGoodsList){
OrderDetailsResponseVo.OrderDetails orderDetails = OrderDetailsResponseVo.OrderDetails.modelDataSupplement(orderGoods); OrderDetailsResponseVo.OrderDetails orderDetails = OrderDetailsResponseVo.OrderDetails.modelDataSupplement(orderGoods);
FinancialDetail financialDetail = longFinancialDetailMap.get(orderGoods.getGoodsId()); FinancialDetail financialDetail = longFinancialDetailMap.get(orderGoods.getOrderGoodsId());
if(ObjectUtils.isNotNull(financialDetail)){ if(ObjectUtils.isNotNull(financialDetail)){
orderDetails.setDiscountMoney(financialDetail.getDiscountMoney()); orderDetails.setDiscountMoney(financialDetail.getDiscountMoney());
orderDetails.setPayMoney(financialDetail.getPayMoney()); orderDetails.setPayMoney(financialDetail.getPayMoney());

2
ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderDetailsResponseVo.java
View File

@ -338,7 +338,7 @@ public class OrderDetailsResponseVo implements Serializable {
public static OrderDetails modelDataSupplement(OrderGoods orderGoods){ public static OrderDetails modelDataSupplement(OrderGoods orderGoods){
OrderDetails orderDetails = new OrderDetails(); OrderDetails orderDetails = new OrderDetails();
if(ObjectUtils.isNotNull(orderGoods)){ if(ObjectUtils.isNotNull(orderGoods)){
orderDetails.setGoodsId(orderGoods.getGoodsId()); orderDetails.setGoodsId(orderGoods.getGoodsStandardId());
orderDetails.setGoodsName(orderGoods.getGoodsName()); orderDetails.setGoodsName(orderGoods.getGoodsName());
orderDetails.setGoodsNum(orderGoods.getGoodsNum()); orderDetails.setGoodsNum(orderGoods.getGoodsNum());
orderDetails.setServerGoodsNum(orderGoods.getServerGoodsNum()); orderDetails.setServerGoodsNum(orderGoods.getServerGoodsNum());

6
ghy-order/src/main/java/com/ghy/order/domain/OrderGoods.java
View File

@ -24,7 +24,7 @@ public class OrderGoods extends BaseEntity {
private Long orderId; private Long orderId;
@Excel(name = "商品规格id", cellType = Excel.ColumnType.NUMERIC) @Excel(name = "商品规格id", cellType = Excel.ColumnType.NUMERIC)
private Long goodsId; private Long goodsStandardId;
@Excel(name = "商品名称", cellType = Excel.ColumnType.STRING) @Excel(name = "商品名称", cellType = Excel.ColumnType.STRING)
private String goodsName; private String goodsName;
@ -46,9 +46,9 @@ public class OrderGoods extends BaseEntity {
public OrderGoods() { public OrderGoods() {
} }
public OrderGoods(Long orderId, Long goodsId, String goodsName, Integer goodsNum, Integer serverGoodsNum) { public OrderGoods(Long orderId, Long goodsStandardId, String goodsName, Integer goodsNum, Integer serverGoodsNum) {
this.orderId = orderId; this.orderId = orderId;
this.goodsId = goodsId; this.goodsStandardId = goodsStandardId;
this.goodsName = goodsName; this.goodsName = goodsName;
this.goodsNum = goodsNum; this.goodsNum = goodsNum;
this.serverGoodsNum = serverGoodsNum; this.serverGoodsNum = serverGoodsNum;

2
ghy-order/src/main/java/com/ghy/order/mapper/OrderGoodsMapper.java
View File

@ -33,7 +33,7 @@ public interface OrderGoodsMapper {
*/ */
OrderGoods selectById(Long orderGoodsId); OrderGoods selectById(Long orderGoodsId);
OrderGoods selectByOrderId(Long orderId); List<OrderGoods> selectByOrderId(Long orderId);
/** /**
* 批量删除订单商品信息 * 批量删除订单商品信息

2
ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java
View File

@ -18,7 +18,7 @@ public interface OrderGoodsService {
*/ */
int insertOrderGoods(OrderGoods orderGoods); int insertOrderGoods(OrderGoods orderGoods);
OrderGoods selectByOrderMasterId(Long orderMasterId); List<OrderGoods> selectByOrderMasterId(Long orderMasterId);
/** /**
* @param orderGoods 订单商品属性 * @param orderGoods 订单商品属性

2
ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java
View File

@ -27,7 +27,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
} }
@Override @Override
public OrderGoods selectByOrderMasterId(Long orderMasterId) { public List<OrderGoods> selectByOrderMasterId(Long orderMasterId) {
return orderGoodsMapper.selectByOrderId(orderMasterId); return orderGoodsMapper.selectByOrderId(orderMasterId);
} }

14
ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
View File

@ -7,7 +7,7 @@
<resultMap id="OrderGoodsResult" type="com.ghy.order.domain.OrderGoods"> <resultMap id="OrderGoodsResult" type="com.ghy.order.domain.OrderGoods">
<id property="orderGoodsId" column="order_goods_id"/> <id property="orderGoodsId" column="order_goods_id"/>
<result property="orderId" column="order_id"/> <result property="orderId" column="order_id"/>
<result property="goodsId" column="goods_id"/> <result property="goodsStandardId" column="goods_standard_id"/>
<result property="goodsName" column="goods_name"/> <result property="goodsName" column="goods_name"/>
<result property="goodsNum" column="goods_num"/> <result property="goodsNum" column="goods_num"/>
<result property="serverGoodsNum" column="server_goods_num"/> <result property="serverGoodsNum" column="server_goods_num"/>
@ -20,7 +20,7 @@
</resultMap> </resultMap>
<sql id="selectOrderGoods"> <sql id="selectOrderGoods">
SELECT order_goods_id, order_id, goods_id, goods_name, goods_num, server_goods_num, SELECT order_goods_id, order_id, goods_standard_id, goods_name, goods_num, server_goods_num,
finish_time, create_by, create_time, update_by, update_time, remark finish_time, create_by, create_time, update_by, update_time, remark
FROM order_goods FROM order_goods
</sql> </sql>
@ -29,7 +29,7 @@
UPDATE order_goods UPDATE order_goods
<set> <set>
<if test="orderId != null and orderId != 0">order_id = #{orderId},</if> <if test="orderId != null and orderId != 0">order_id = #{orderId},</if>
<if test="goodsId != null and goodsId != 0">goods_id = #{goodsId},</if> <if test="goodsStandardId != null and goodsStandardId != 0">goods_standard_id = #{goodsStandardId},</if>
<if test="goodsName != null and goodsName != ''">goods_name = #{goodsName},</if> <if test="goodsName != null and goodsName != ''">goods_name = #{goodsName},</if>
<if test="goodsNum != null">goods_num = #{goodsNum},</if> <if test="goodsNum != null">goods_num = #{goodsNum},</if>
<if test="serverGoodsNum != null">server_goods_num = #{serverGoodsNum},</if> <if test="serverGoodsNum != null">server_goods_num = #{serverGoodsNum},</if>
@ -44,7 +44,7 @@
keyProperty="orderGoodsId"> keyProperty="orderGoodsId">
INSERT INTO order_goods( INSERT INTO order_goods(
<if test="orderId != null and orderId != 0">order_id,</if> <if test="orderId != null and orderId != 0">order_id,</if>
<if test="goodsId != null and goodsId != 0">goods_id,</if> <if test="goodsStandardId != null and goodsStandardId != 0">goods_standard_id,</if>
<if test="goodsName != null and goodsName != ''">goods_name,</if> <if test="goodsName != null and goodsName != ''">goods_name,</if>
<if test="goodsNum != null">goods_num,</if> <if test="goodsNum != null">goods_num,</if>
<if test="serverGoodsNum != null">server_goods_num,</if> <if test="serverGoodsNum != null">server_goods_num,</if>
@ -53,7 +53,7 @@
create_time create_time
)VALUES( )VALUES(
<if test="orderId != null and orderId != 0">#{orderId},</if> <if test="orderId != null and orderId != 0">#{orderId},</if>
<if test="goodsId != null and goodsId != 0">#{goodsId},</if> <if test="goodsStandardId != null and goodsStandardId != 0">#{goodsStandardId},</if>
<if test="goodsName != null and goodsName != ''">#{goodsName},</if> <if test="goodsName != null and goodsName != ''">#{goodsName},</if>
<if test="goodsNum != null">#{goodsNum},</if> <if test="goodsNum != null">#{goodsNum},</if>
<if test="serverGoodsNum != null">#{serverGoodsNum},</if> <if test="serverGoodsNum != null">#{serverGoodsNum},</if>
@ -69,8 +69,8 @@
<if test="orderId != null and orderId != 0"> <if test="orderId != null and orderId != 0">
AND order_id = #{orderId} AND order_id = #{orderId}
</if> </if>
<if test="goodsId != null and goodsId != 0"> <if test="goodsStandardId != null and goodsStandardId != 0">
AND goods_id = #{goodsId} AND goods_standard_id = #{goodsStandardId}
</if> </if>
<if test="goodsName != null and goodsName != ''"> <if test="goodsName != null and goodsName != ''">
AND goods_name LIKE concat('%', #{goodsName}, '%') AND goods_name LIKE concat('%', #{goodsName}, '%')