|
@@ -1,6 +1,7 @@
|
|
package com.pj.tb_goods_transit;
|
|
package com.pj.tb_goods_transit;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
+import com.pj.current.config.SystemObject;
|
|
import com.pj.current.dto.APPLoginUserInfo;
|
|
import com.pj.current.dto.APPLoginUserInfo;
|
|
import com.pj.enummj.*;
|
|
import com.pj.enummj.*;
|
|
import com.pj.retry.SmsRetryService;
|
|
import com.pj.retry.SmsRetryService;
|
|
@@ -122,7 +123,7 @@ public class MethodGoodsTransitService {
|
|
tbOrder.setTradeAreaName(tbGoodsTransit.getTradeAreaName());
|
|
tbOrder.setTradeAreaName(tbGoodsTransit.getTradeAreaName());
|
|
tbOrder.setGoodsId(tbGoodsTransit.getId());
|
|
tbOrder.setGoodsId(tbGoodsTransit.getId());
|
|
tbOrder.setSaleMainId(Long.valueOf(tbGoodsTransit.getMerchantId()));
|
|
tbOrder.setSaleMainId(Long.valueOf(tbGoodsTransit.getMerchantId()));
|
|
-// tbOrder.setTradeNo(); // 交易编号
|
|
|
|
|
|
+ tbOrder.setTradeNo(SystemObject.getREFcode("YJSCDD",new Date())); // 交易编号
|
|
tbOrder.setBuyUserId(tbPeopleList.get(0).getId());
|
|
tbOrder.setBuyUserId(tbPeopleList.get(0).getId());
|
|
tbOrder.setBuyUserType(2 + "");
|
|
tbOrder.setBuyUserType(2 + "");
|
|
tbOrder.setBuyUserName(appLoginInfo.getLoginName());
|
|
tbOrder.setBuyUserName(appLoginInfo.getLoginName());
|