|
@@ -23,6 +23,7 @@ import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
|
|
|
import com.ym.mec.thirdparty.yqpay.YqPayUtil;
|
|
|
import com.ym.mec.util.collection.MapUtil;
|
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -228,7 +229,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
order.setMemo(rpMap.get("remarks"));
|
|
|
}
|
|
|
order.setStatus(status);
|
|
|
- order.setTransNo(rpMap.get("orderNo"));
|
|
|
+ if (StringUtils.isBlank(order.getTransNo())) {
|
|
|
+ order.setTransNo(rpMap.get("orderNo"));
|
|
|
+ }
|
|
|
order.setPaymentBusinessChannel(rpMap.get("channelType"));
|
|
|
|
|
|
if (order.getType().equals(OrderTypeEnum.APPLY)) { //报名订单
|