|
@@ -128,6 +128,9 @@ public class PayOrderLogic {
|
|
|
@Autowired
|
|
|
WorkerPartsStockLogic workerPartsStockLogic;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ PayRecordService payRecordService;
|
|
|
+
|
|
|
public Page<WebsitNormCharge> pageCharge(String name, String categoryId, String orderId,Integer pageNum, Integer pageSize) {
|
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
|
Page<WebsitNormCharge> list = websitNormChargeService.lambdaQuery()
|
|
@@ -598,10 +601,14 @@ public class PayOrderLogic {
|
|
|
adminWebsit.getPayWorkerCodeId(), workerOrder.getSource());
|
|
|
|
|
|
workerOrder.setTranscationId(transcationId);
|
|
|
+
|
|
|
+ PayRecord payRecord = payRecordService.lambdaQuery().eq(PayRecord::getTransactionId, transcationId).one();
|
|
|
+
|
|
|
+ workerOrder.setOpenId(payRecord.getOpenId());
|
|
|
}
|
|
|
|
|
|
|
|
|
- workerOrder.setOpenId(currentCompanyWechat.getUser().getOpenId());
|
|
|
+
|
|
|
workerOrder.setConfigId(adminWebsit.getPayWorkerCodeId());
|
|
|
workerOrder.updateById();
|
|
|
}
|