|
|
|
@ -61,6 +61,9 @@ import org.springframework.transaction.support.TransactionTemplate; |
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.BigDecimal; |
|
|
|
|
|
|
|
import java.text.ParseException; |
|
|
|
|
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
|
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
import java.util.*; |
|
|
|
import java.util.*; |
|
|
|
import java.util.function.Function; |
|
|
|
import java.util.function.Function; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
@ -1811,6 +1814,8 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder |
|
|
|
public boolean add(TradeOrderRespDTO request) { |
|
|
|
public boolean add(TradeOrderRespDTO request) { |
|
|
|
List<StoreOrderInfo> storeOrderInfos=new ArrayList<>(); |
|
|
|
List<StoreOrderInfo> storeOrderInfos=new ArrayList<>(); |
|
|
|
String orderNo=CrmebUtil.getOrderNo("order1"); |
|
|
|
String orderNo=CrmebUtil.getOrderNo("order1"); |
|
|
|
|
|
|
|
SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
|
|
|
|
|
|
|
DateTimeFormatter dateTimeFormatter= DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); |
|
|
|
Integer totalNum=0; |
|
|
|
Integer totalNum=0; |
|
|
|
BigDecimal totalPrice=BigDecimal.ZERO; |
|
|
|
BigDecimal totalPrice=BigDecimal.ZERO; |
|
|
|
for(TradeOrderDetailRespDTO detail:request.getItem()){ |
|
|
|
for(TradeOrderDetailRespDTO detail:request.getItem()){ |
|
|
|
@ -1873,9 +1878,13 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder |
|
|
|
storeOrder.setTotalPostage(BigDecimal.ZERO); |
|
|
|
storeOrder.setTotalPostage(BigDecimal.ZERO); |
|
|
|
storeOrder.setPayPrice(totalPrice); |
|
|
|
storeOrder.setPayPrice(totalPrice); |
|
|
|
storeOrder.setPaid(true); |
|
|
|
storeOrder.setPaid(true); |
|
|
|
storeOrder.setPayTime(new Date()); |
|
|
|
try { |
|
|
|
|
|
|
|
storeOrder.setPayTime(simpleDateFormat.parse(request.getOrderTime().format(dateTimeFormatter))); |
|
|
|
|
|
|
|
} catch (ParseException e) { |
|
|
|
|
|
|
|
throw new RuntimeException(e); |
|
|
|
|
|
|
|
} |
|
|
|
storeOrder.setPayType("weixin"); |
|
|
|
storeOrder.setPayType("weixin"); |
|
|
|
storeOrder.setCreateTime(new Date()); |
|
|
|
storeOrder.setCreateTime(storeOrder.getPayTime()); |
|
|
|
storeOrder.setStatus(0); |
|
|
|
storeOrder.setStatus(0); |
|
|
|
storeOrder.setCost(totalPrice); |
|
|
|
storeOrder.setCost(totalPrice); |
|
|
|
storeOrder.setIsChannel(4); |
|
|
|
storeOrder.setIsChannel(4); |
|
|
|
|