quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-07 17:21:53 +08:00
parent 8240104de7
commit 2b7a0b2b15
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineEntity.java
View File

@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date;
/**
*购物车
* @author quyixiao
* @since 2025-11-06
* @since 2025-11-07
*/
@Data
@ -130,7 +130,7 @@ private static final long serialVersionUID = 1L;
//创建时间
private Long createTimestamp;
//修改时间
private Date modifyTimestamp;
private Long modifyTimestamp;
//订单id
private Long buyerId;
//买家手机号
@ -581,14 +581,14 @@ private static final long serialVersionUID = 1L;
* 修改时间
* @return
*/
public Date getModifyTimestamp() {
public Long getModifyTimestamp() {
return modifyTimestamp;
}
/**
* 修改时间
* @param modifyTimestamp
*/
public void setModifyTimestamp(Date modifyTimestamp) {
public void setModifyTimestamp(Long modifyTimestamp) {
this.modifyTimestamp = modifyTimestamp;
}

3
api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/OrderStatusEnums.java
View File

@ -1,8 +1,7 @@
package com.heyu.api.alibaba.request.mm.enums;
public enum OrderStatusEnums {
create("create","订单创建"),
wait_pay("wait_pay","待支付"),
wait_shipping("wait_shipping","待发货"),
cancel("cancel","买家取消订单"),

14
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDTO.java
View File

@ -20,21 +20,13 @@ public class VvTradeOrderDTO extends AppBaseRequest {
public static void main(String[] args) {
VvTradeOrderDTO vvTradeOrderDTO = new VvTradeOrderDTO();
vvTradeOrderDTO.setBuyerId(2L);
vvTradeOrderDTO.setBuyerAddressId(2L);
vvTradeOrderDTO.setBuyerId(7L);
vvTradeOrderDTO.setBuyerAddressId(9L);
List<VvTradeOrderLineDTO> vvTradeOrderLineDTOList = Lists.newArrayList();
VvTradeOrderLineDTO vvTradeOrderLineDTO = new VvTradeOrderLineDTO();
vvTradeOrderLineDTO.setSkuId(91L);
vvTradeOrderLineDTO.setSkuId(346L);
vvTradeOrderLineDTO.setNum(2);
vvTradeOrderLineDTOList.add(vvTradeOrderLineDTO);
VvTradeOrderLineDTO vvTradeOrderLineDTO2 = new VvTradeOrderLineDTO();
vvTradeOrderLineDTO2.setSkuId(92L);
vvTradeOrderLineDTO2.setNum(3);
vvTradeOrderLineDTOList.add(vvTradeOrderLineDTO2);
vvTradeOrderDTO.setVvTradeOrderLineDTOList(vvTradeOrderLineDTOList);
System.out.println(JSON.toJSONString(vvTradeOrderDTO));

19
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
View File

@ -250,7 +250,7 @@ public class AppOrderController {
}
Map<Long, Integer> productNumMap = new HashMap<>();
VvBuyerAddressEntity vvBuyerAddress = vvBuyerAddressDao.selectVvBuyerAddressById(vvOrderRequest.getBuyerAddressId());
for (VvTradeOrderLineDTO vvTradeOrderLineDTO : vvOrderRequest.getVvTradeOrderLineDTOList()) {
VvSkuEntity vvSkuEntity = skuEntityMap.get(vvTradeOrderLineDTO.getSkuId());
Integer saleCount = productNumMap.get(vvSkuEntity.getProductId());
@ -264,7 +264,7 @@ public class AppOrderController {
allNum = allNum + vvTradeOrderLineDTO.getNum();
allPrice = BigDecimalUtil.add(BigDecimalUtil.multiply(vvSkuEntity.getSalePrice(), new BigDecimal(vvTradeOrderLineDTO.getNum())), allPrice);
allPrice = BigDecimalUtil.add(BigDecimalUtil.multiply(vvSkuEntity.getPromotionPrice(), new BigDecimal(vvTradeOrderLineDTO.getNum())), allPrice);
List<VvSkuPropertyValueEntity> vvSkuPropertyValueEntities = vvSkuPropertyValueMap.get(vvTradeOrderLineDTO.getSkuId());
@ -277,6 +277,8 @@ public class AppOrderController {
propertyNameValue.setPropertyValue(vvSkuPropertyValueEntity.getProductPropertyValue());
propertyNameValues.add(propertyNameValue);
}
for (int i = 0; i < vvTradeOrderLineDTO.getNum(); i++) {
VvTradeOrderLineEntity vvTradeOrderLineEntity = new VvTradeOrderLineEntity();
vvTradeOrderLineEntity.setSkuId(vvTradeOrderLineDTO.getSkuId());
@ -286,12 +288,21 @@ public class AppOrderController {
vvTradeOrderLineEntity.setSalePrice(vvSkuEntity.getSalePrice());
vvTradeOrderLineEntity.setSkuImageUrl(vvSkuEntity.getImageUrl());
vvTradeOrderLineEntity.setOriginPrice(vvSkuEntity.getOriginPrice());
vvTradeOrderLineEntity.setPromotionPrice(vvSkuEntity.getPromotionPrice());
vvTradeOrderLineEntity.setSalePrice(vvSkuEntity.getSalePrice());
vvTradeOrderLineEntity.setStatus(OrderStatusEnums.wait_pay.getStatus());
vvTradeOrderLineEntity.setProductId(vvSkuEntity.getProductId());
vvTradeOrderLineEntity.setProductName(vvProduct.getTitle());
vvTradeOrderLineEntity.setPromotionPrice(vvSkuEntity.getPromotionPrice());
vvTradeOrderLineEntity.setProductMainImageUrl(vvProduct.getMainImageUrl());
vvTradeOrderLineEntity.setSkuInfo(JSON.toJSONString(propertyNameValues));
vvTradeOrderLineEntity.setCreateTimestamp(System.currentTimeMillis());
vvTradeOrderLineEntity.setModifyTimestamp(System.currentTimeMillis());
vvTradeOrderLineEntity.setProvince(vvBuyerAddress.getProvince());
vvTradeOrderLineEntity.setCity(vvBuyerAddress.getCity());
vvTradeOrderLineEntity.setDistrict(vvBuyerAddress.getDistrict());
vvTradeOrderLineEntity.setStatus(OrderStatusEnums.create.getStatus());
vvTradeOrderLineEntity.setBuyerId(vvOrderRequest.getBuyerId());
vvTradeOrderLineEntityList.add(vvTradeOrderLineEntity);
vvTradeOrderLineEntity.setBatchNum(vvTradeOrderLineDTO.getNum());
}
@ -307,7 +318,7 @@ public class AppOrderController {
vvTradeOrderEntity.setBuyerName(vvBuyerEntity.getBuyerName());
vvTradeOrderEntity.setBuyerWeixin(vvBuyerEntity.getBuyerWeixin());
vvTradeOrderEntity.setGmtDownOrder(new Date());
VvBuyerAddressEntity vvBuyerAddress = vvBuyerAddressDao.selectVvBuyerAddressById(vvOrderRequest.getBuyerAddressId());
vvTradeOrderEntity.setContry(vvBuyerAddress.getContry());
vvTradeOrderEntity.setProvince(vvBuyerAddress.getProvince());
vvTradeOrderEntity.setCity(vvBuyerAddress.getCity());
@ -317,6 +328,8 @@ public class AppOrderController {
vvTradeOrderEntity.setBuyerId(vvOrderRequest.getBuyerId());
vvTradeOrderEntity.setCreateTimestamp(System.currentTimeMillis());
vvTradeOrderEntity.setModifyTimestamp(System.currentTimeMillis());
vvTradeOrderDao.insertVvTradeOrder(vvTradeOrderEntity);
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setTradeOrderId(vvTradeOrderEntity.getId());