|
@@ -7,6 +7,7 @@ import com.platform.yijia.pojo.PayOrder;
|
|
|
|
|
|
import com.platform.yijia.pojo.PayOrderExample;
|
|
|
import com.platform.yijia.service.PayOrderService;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
@@ -31,17 +32,6 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
@Override
|
|
|
@Transactional
|
|
|
public String AddPayOrderInfo(PayOrderRequest payOrderRequest, PayOrder payOrder) {
|
|
|
- payOrder.setStatus(payOrderRequest.getStatus()); //创建订单 未支付状态 0
|
|
|
- payOrder.setAmt(payOrderRequest.getAmt()); //金额
|
|
|
- payOrder.setOilName(payOrderRequest.getOilName()); //油品名称
|
|
|
- payOrder.setStationId(payOrderRequest.getStationId()); //油站id
|
|
|
- payOrder.setPayType(payOrderRequest.getPayType()); //支付类型
|
|
|
- payOrder.setPayWay(payOrderRequest.getPayWay()); //支付方式
|
|
|
- payOrder.setPayDate(new Date()); //支付时间
|
|
|
- payOrder.setOilPersonnel(payOrderRequest.getOilPersonnel()); //加油员
|
|
|
- payOrder.setCreatedDate(new Date()); //创建时间
|
|
|
- payOrder.setOrderType(payOrderRequest.getOrderType()); //订单类型
|
|
|
-
|
|
|
//订单规则 时间+6位随机数
|
|
|
Random random = new Random();
|
|
|
String result="";
|
|
@@ -51,7 +41,20 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
System.out.println("随机生成6位数result :"+result);
|
|
|
String ordNo=System.nanoTime()+result;
|
|
|
payOrder.setOrderNo(ordNo);
|
|
|
-
|
|
|
+ payOrder.setOilName(payOrderRequest.getOilName()); //油品名称
|
|
|
+ payOrder.setAmt(payOrderRequest.getAmt()); //金额
|
|
|
+ payOrder.setStationId(payOrderRequest.getStationId()); //油站id
|
|
|
+ payOrder.setStatus("0"); //创建订单 未支付状态 0
|
|
|
+ payOrder.setPayType("sxf"); //支付类型
|
|
|
+ if(StringUtils.isNotBlank(payOrderRequest.getUserType())&& payOrderRequest.getUserType().equals("1")){
|
|
|
+ payOrder.setPayWay("02"); //支付方式:02公众号,03小程序',
|
|
|
+ }else if(StringUtils.isNotBlank(payOrderRequest.getUserType())&& payOrderRequest.getUserType().equals("1")){
|
|
|
+ payOrder.setPayWay("03");
|
|
|
+ }
|
|
|
+ payOrder.setPayDate(new Date()); //支付时间
|
|
|
+ payOrder.setOilPersonnel(payOrderRequest.getOilPersonnel()); //加油员
|
|
|
+ payOrder.setCreatedDate(new Date()); //创建时间
|
|
|
+ payOrder.setOrderType(payOrderRequest.getOrderType());//订单类型
|
|
|
//根据油站和油枪获取油枪编号和价格
|
|
|
HashMap<String, Object> params = new HashMap<>();
|
|
|
params.put("oilGunId", payOrderRequest.getOilGun());
|
|
@@ -74,7 +77,6 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
String oilPrice = mapOilGunNoAndOilPrice.get("oilPrice").toString(); //原始价格
|
|
|
payOrder.setOrderLiters(recKonOrderLiters(amt, oilPrice, 2)); //计算油价升数存放
|
|
|
}
|
|
|
-
|
|
|
//数据落地
|
|
|
payOrderMapper.insertSelective(payOrder);
|
|
|
//根据订单号查询出订单
|