|
|
@@ -6,11 +6,13 @@ import com.github.microservice.models.type.PaymentType;
|
|
|
import com.zhongshu.card.client.ret.ResultContent;
|
|
|
import com.zhongshu.card.server.core.dao.CardInfoDao;
|
|
|
import com.zhongshu.card.server.core.dao.org.UserCountDao;
|
|
|
+import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;
|
|
|
import com.zhongshu.card.server.core.dao.school.DeviceInfoDao;
|
|
|
import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
|
|
|
import com.zhongshu.card.server.core.domain.org.DeviceInfo;
|
|
|
import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
|
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
|
+import com.zhongshu.card.server.core.util.TokenUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -42,6 +44,9 @@ public class HxzService extends SuperService {
|
|
|
@Autowired
|
|
|
ExpenseFlowServiceImpl expenseFlowService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ ExpenseFlowDao expenseFlowDao;
|
|
|
+
|
|
|
/**
|
|
|
* 得到系统时间
|
|
|
*
|
|
|
@@ -74,11 +79,19 @@ public class HxzService extends SuperService {
|
|
|
// 返回参数
|
|
|
ConsumTransactionsFullResult result = new ConsumTransactionsFullResult();
|
|
|
result.setPaymentType(param.getPaymentType());
|
|
|
-
|
|
|
ConsumTransactionsResult resultModel = new ConsumTransactionsResult();
|
|
|
+
|
|
|
+ ConsumTransactionsModel param1 = param.getParam();
|
|
|
+ String mqttDataId = param1.getMqttDataId();
|
|
|
+ ExpenseFlow expenseFlow = expenseFlowDao.init(mqttDataId, TokenUtil.create());
|
|
|
+ if (ObjectUtils.isEmpty(expenseFlow)) {
|
|
|
+ resultModel.setFailed("重复订单");
|
|
|
+ result.setModel(resultModel);
|
|
|
+ return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
|
|
|
+ }
|
|
|
// 创建订单
|
|
|
- ResultContent<ExpenseFlow> createResult = expenseFlowService.createExpenseFlowByHxz(param);
|
|
|
- ExpenseFlow expenseFlow = createResult.getContent();
|
|
|
+ ResultContent<ExpenseFlow> createResult = expenseFlowService.createExpenseFlowByHxz(param, expenseFlow);
|
|
|
+ expenseFlow = createResult.getContent();
|
|
|
|
|
|
// 支付
|
|
|
ResultContent<ExpenseFlow> resultContent = expenseFlowService.expendPay(expenseFlow);
|
|
|
@@ -92,6 +105,7 @@ public class HxzService extends SuperService {
|
|
|
resultModel = expenseFlowService.buildConsumTransactionsResult(expenseFlow.getOrderNo(), expenseFlow.getCardNo());
|
|
|
result.setModel(resultModel);
|
|
|
requestInfoService.addRequestInfo(param, resultModel);
|
|
|
+
|
|
|
return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
|
|
|
}
|
|
|
|
|
|
@@ -120,17 +134,25 @@ public class HxzService extends SuperService {
|
|
|
// 返回参数
|
|
|
QRCodeTransactionFullResult result = new QRCodeTransactionFullResult();
|
|
|
result.setPaymentType(param.getPaymentType());
|
|
|
+
|
|
|
QRCodeTransactionResult model = new QRCodeTransactionResult();
|
|
|
+ String mqttDataId = param.getMqttDataId();
|
|
|
+ ExpenseFlow expenseFlow = expenseFlowDao.init(mqttDataId, TokenUtil.create());
|
|
|
+ if (ObjectUtils.isEmpty(expenseFlow)) {
|
|
|
+ model.setFailed("重复订单");
|
|
|
+ result.setModel(model);
|
|
|
+ return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
|
|
|
+ }
|
|
|
|
|
|
// 创建订单
|
|
|
- ResultContent<ExpenseFlow> createResult = expenseFlowService.createExpenseFlowByHxz(param);
|
|
|
- ExpenseFlow expenseFlow = createResult.getContent();
|
|
|
+ ResultContent<ExpenseFlow> createResult = expenseFlowService.createExpenseFlowByHxz(param, expenseFlow);
|
|
|
+ expenseFlow = createResult.getContent();
|
|
|
|
|
|
// 扣款支付订单
|
|
|
ResultContent<ExpenseFlow> resultContent = expenseFlowService.expendPayQrCode(expenseFlow);
|
|
|
if (resultContent.isFailed()) {
|
|
|
model.setFailed(resultContent.getMsg());
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
model.setSuccess();
|
|
|
model.setQrorder(expenseFlow.getOrderNo());
|
|
|
}
|