|
@@ -30,6 +30,7 @@ import org.springframework.context.annotation.Bean;
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.util.ArrayList;
|
|
|
|
|
|
@Data
|
|
@@ -117,9 +118,11 @@ public class StandarOrderJob {
|
|
|
log.info("计算价格:{}", JSONUtil.toJsonStr(calculate));
|
|
|
CalculateVo calculateVo = calculate.getContent();
|
|
|
// 设置订单价格
|
|
|
- createOrder2Model.setTotalAmount(calculateVo.getOriginalPrice());
|
|
|
+// createOrder2Model.setTotalAmount(calculateVo.getOriginalPrice());
|
|
|
+ createOrder2Model.setTotalAmount(calculateVo.getPrice());
|
|
|
createOrder2Model.setPayAmount(calculateVo.getPrice());
|
|
|
- createOrder2Model.setDiscountAmount(calculateVo.getOffset());
|
|
|
+// createOrder2Model.setDiscountAmount(calculateVo.getOffset());
|
|
|
+ createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
|
|
|
|
|
|
goods.setPayAmount(calculateVo.getPrice());
|
|
|
|