一级市场增加车牌

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementService.java

@@ -1,5 +1,6 @@
 package com.pj.ht_trade_settlement;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -108,7 +109,7 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
 
         TbTradeArea tbTradeArea = tbTradeAreaService.updateHandler(tradeSettlementDto.getFieldCode(), tradeSettlementDto.getFieldName());
         TbShop tbShop = tbShopService.findByCode(tradeSettlementDto.getShopNo());
-
+       Date applyTime= DateUtil.parseDateTime( tradeSettlementDto.getDeclTime());
 		bordersListDtoList.forEach(item -> {
 			//开始创建边民订单
 			TbOrder tbOrder = new TbOrder();
@@ -120,7 +121,7 @@ public class HtTradeSettlementService extends ServiceImpl<HtTradeSettlementMappe
 					.setTradeAreaId(tbTradeArea.getId()).setTradeAreaName(tbTradeArea.getName());
 			tbOrder.setTotalWeight(item.getGrossWt()).setTotalPrice(item.getBuyAmount());
 
-			tbOrder.setApply(ApplyStatus.APPLY_STATUS_ONE.getCode());
+			tbOrder.setApply(ApplyStatus.APPLY_STATUS_ONE.getCode()).setApplyTime(applyTime).setVeNo(tradeSettlementDto.getVeNo());
 			tbOrder.setDeleteStatus(DeleteStatus.DELETE_STATUS_ON.getCode());
 			tbOrder.setResaleStatus(ResaleStatus.RESALE_STATUS_ZERO.getCode());
 			tbOrder.setFinishStatus(OrderStatus.ORDER_STATUS_ZERO.getCode());

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrder.java

@@ -324,6 +324,10 @@ public class TbOrder extends Model<TbOrder> implements Serializable {
 	 * 创建人名称
 	 */
 	private String createName;
+	/**
+	 * 车牌号
+	 */
+	private String veNo;
 
 	/**
 	 * 更新时间

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -448,7 +448,6 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 
 		//2、修改一级市场订单支付状态为已支付,修改一级市场订单完成状态为已完成
 		//获取登录人
-		APPLoginUserInfo appLoginInfo = StpAPPUserUtil.getAPPLoginInfo();
 		//获取出了一级市场的所有边民订单
 		LambdaQueryWrapper<TbOrder> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(TbOrder::getPreNo, billCode);
@@ -460,8 +459,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
 			order.setPayType(0); //支付类型
 			order.setFinishStatus(FinishStatus.FINISH_STATUS_ONE.getCode()); //已完成
 
-			order.setUpdateBy(appLoginInfo.getLoginId());
-			order.setUpdateName(appLoginInfo.getLoginName());
+
 			order.setUpdateTime(new Date());
 
 			boolean result = updateById(order);