|
@@ -516,6 +516,7 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
c.setStationId(customerCardUseRecord.getStationId());
|
|
|
c.setCardOilsType(customerCardUseRecord.getCardOilsType());
|
|
|
electronicMembershipCardService.updateElectronicCardInfoByUnionId(c);
|
|
|
+ payOrder.setStatus("1");
|
|
|
payOrderMapper.insert(payOrder);
|
|
|
}else {
|
|
|
resultMap.put("balanceNoEnough", "余额不足!");
|
|
@@ -539,9 +540,10 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
resultMap.put("amt", payOrderRequest.getReceivableAmt());
|
|
|
resultMap.put("oilLiters", "0");
|
|
|
resultMap.put("discountPrice", "0");
|
|
|
- if(payOrderRequest.getPayType().equals("wx")){
|
|
|
+ if(payOrderRequest.getPayType().equals("wx")){ //微信支付
|
|
|
payOrder.setWxAmt(Double.valueOf(resultMap.get("amt").toString())); //微信支付金额
|
|
|
}else if(payOrderRequest.getPayType().equals("dzk")){
|
|
|
+ //电子会员卡支付
|
|
|
payOrder.setDzkAmt(Double.valueOf(resultMap.get("amt").toString()));
|
|
|
CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
|
|
|
customerElectronicCard.setCardOilsType(payOrderRequest.getCardOilsType());
|
|
@@ -575,6 +577,7 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
c.setStationId(customerCardUseRecord.getStationId());
|
|
|
c.setCardOilsType(customerCardUseRecord.getCardOilsType());
|
|
|
electronicMembershipCardService.updateElectronicCardInfoByUnionId(c);
|
|
|
+ payOrder.setStatus("1");
|
|
|
payOrderMapper.insertSelective(payOrder);
|
|
|
}else {
|
|
|
resultMap.put("balanceNoEnough", "余额不足!");
|