|
|
@@ -40,6 +40,8 @@ import com.yami.shop.bean.event.SubmitOrderEvent;
|
|
|
import com.yami.shop.bean.event.SubmitScoreOrderEvent;
|
|
|
import com.yami.shop.bean.model.*;
|
|
|
import com.yami.shop.bean.param.*;
|
|
|
+import com.yami.shop.bean.po.SMOrderItemPo;
|
|
|
+import com.yami.shop.bean.po.SMOrderPo;
|
|
|
import com.yami.shop.bean.vo.ExportContext;
|
|
|
import com.yami.shop.bean.vo.OrderCountVo;
|
|
|
import com.yami.shop.common.config.Constant;
|
|
|
@@ -60,7 +62,10 @@ import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.apache.poi.ss.usermodel.*;
|
|
|
+import org.apache.poi.ss.usermodel.CellStyle;
|
|
|
+import org.apache.poi.ss.usermodel.Row;
|
|
|
+import org.apache.poi.ss.usermodel.Sheet;
|
|
|
+import org.apache.poi.ss.usermodel.Workbook;
|
|
|
import org.apache.poi.xssf.streaming.SXSSFSheet;
|
|
|
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@@ -2494,6 +2499,57 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
log.info("删除临时子订单成功,子订单号:{},父订单号:{}", subOrderNumber, parentOrderNumber);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void addSMOrder(SMOrderPo orderPo) {
|
|
|
+ Order order = new Order();
|
|
|
+ order.setShopId(0L);
|
|
|
+ order.setChannelId(0L);
|
|
|
+ order.setUserId("");
|
|
|
+ order.setOrderNumber(orderPo.getOrderNumber());
|
|
|
+ order.setTotal(orderPo.getTotal());
|
|
|
+ order.setActualTotal(orderPo.getActualTotal());
|
|
|
+ order.setPayType(orderPo.getPayType());
|
|
|
+ order.setRemarks(orderPo.getRemarks());
|
|
|
+ order.setHbOrderStatus(10);
|
|
|
+ order.setHbLogisticStatus(0);
|
|
|
+ order.setDvyType(orderPo.getDvyType());
|
|
|
+ order.setFreightAmount(orderPo.getFreightAmount());
|
|
|
+ order.setCreateTime(new Date());
|
|
|
+ order.setUpdateTime(new Date());
|
|
|
+ order.setPayTime(orderPo.getPayTime());
|
|
|
+ order.setIsPayed(1);
|
|
|
+ order.setDeleteStatus(0);
|
|
|
+ order.setOrderType(4);
|
|
|
+ order.setCommSts(0);
|
|
|
+ order.setOffsetPoints(orderPo.getOffsetPoints());
|
|
|
+ List<SMOrderItemPo> orderItems = orderPo.getOrderItems();
|
|
|
+ List<String> list = orderItems.stream().map(SMOrderItemPo::getSkuName).collect(Collectors.toList());
|
|
|
+ order.setProdName(String.join(",",list));
|
|
|
+ order.setProductNums(orderItems.stream().map(SMOrderItemPo::getProdCount).reduce(0, Integer::sum));
|
|
|
+ orderMapper.insert(order);
|
|
|
+ orderItems.forEach(c->{
|
|
|
+ OrderItem item = new OrderItem();
|
|
|
+ item.setShopId(0L);
|
|
|
+ item.setOrderNumber(order.getOrderNumber());
|
|
|
+ item.setProdId(c.getProdId());
|
|
|
+ item.setSkuId(c.getSkuId());
|
|
|
+ item.setProdCount(c.getProdCount());
|
|
|
+ item.setProdName(c.getProdName());
|
|
|
+ item.setSkuName(c.getSkuName());
|
|
|
+ item.setPic(c.getPic());
|
|
|
+ item.setPrice(c.getPrice());
|
|
|
+ item.setUserId("");
|
|
|
+ item.setProductTotalAmount(c.getProductTotalAmount());
|
|
|
+ item.setRecTime(c.getRecTime());
|
|
|
+ item.setCommSts(0);
|
|
|
+ item.setBasketDate(new Date());
|
|
|
+ item.setUseScore(c.getUseScore());
|
|
|
+ item.setGainScore(c.getGainScore());
|
|
|
+ orderItemService.save(item);
|
|
|
+ });
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 为手动拆单的子订单分配积分和金额
|
|
|
*/
|