|
@@ -426,6 +426,17 @@ public class PayOrderLogic {
|
|
|
|
|
|
workerOrder.setSource(commonLogic.getSource().equals("A")?OrderInfoSourceEnum.A.getRemark():OrderInfoSourceEnum.B.getRemark() );
|
|
|
|
|
|
+
|
|
|
+ if (!StringUtil.isEmpty(workerOrder.getWorkerOrderId())){
|
|
|
+ PgOrderBase pgOrderBase = pgOrderBaseService.getById(workerOrder.getWorkerOrderId());
|
|
|
+ if (pgOrderBase != null){
|
|
|
+ workerOrder.setSaleType(pgOrderBase.getSaleType());
|
|
|
+ workerOrder.setOrderSmallType(pgOrderBase.getOrderSmallType());
|
|
|
+ workerOrder.setOrderSmallTypeText(pgOrderBase.getOrderSmallTypeText());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
workerOrder.setPayTime(new Date());
|
|
|
workerOrder.setPayType(payType);
|
|
|
workerOrder.setUserId(currentCompanyWechat.getUserId());
|