变更

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Biding.java

@@ -159,7 +159,7 @@ public class Biding implements Serializable {
 	 * 件数
 	 */
 	@ApiModelProperty(value = "件数")
-	private BigDecimal number;
+	private Integer number;
 
 	/**
 	 * 重量

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/BidingItems.java

@@ -1,9 +1,11 @@
 package org.springblade.purchase.sales.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -92,7 +94,7 @@ public class BidingItems implements Serializable {
 	 * 箱量
 	 */
 	@ApiModelProperty(value = "箱量")
-	private BigDecimal boxAmount;
+	private Integer boxAmount;
 
 	/**
 	 * 海运费
@@ -164,12 +166,16 @@ public class BidingItems implements Serializable {
 	 * 截单日期
 	 */
 	@ApiModelProperty(value = "截单日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date cutOffTime;
 
 	/**
 	 * 截港日期
 	 */
 	@ApiModelProperty(value = "截港日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date harborInterceptionTime;
 
 	/**

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -113,6 +113,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 				List<OrderAddress> orderAddressList = orderAddressMapper.selectList(new LambdaQueryWrapper<OrderAddress>()
 					.eq(OrderAddress::getOrderId, record.getOrderId())
 					.eq(OrderAddress::getIsDeleted, 0)
+					.orderByAsc(OrderAddress::getSort)
 				);
 				record.setOrderAddressList(orderAddressList);
 			}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/BidingItemsController.java

@@ -49,11 +49,8 @@ public class BidingItemsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "删除", notes = "传入bidingItems")
 	public R update(@Valid @RequestBody BidingItems bidingItems){
-		if (bidingItems.getId() == null){
-			return R.fail(500, "请选择要删除的数据");
-		}
-		bidingItems.setIsDeleted(1);
-		return R.status(bidingItemsService.updateById(bidingItems));
+		bidingItemsService.updateItems(bidingItems);
+		return R.success("删除成功");
 	}
 
 	/**

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingMapper.xml

@@ -54,6 +54,10 @@
         <where>
             BB.is_deleted = 0
             and BBA.is_deleted = 0
+            and BB.status = 4
+            <if test="biding.deadlineTime != null and biding.deadlineTime != ''">
+                and BB.deadline_time &lt;= #{biding.deadlineTime}
+            </if>
         </where>
     </select>
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IBidingItemsService.java

@@ -23,13 +23,22 @@ public interface IBidingItemsService extends IService<BidingItems> {
 
 	/**
 	 * 获得订单明细信息
+	 * @param biding
+	 * @param distinguish	区分标识
+	 * @return
 	 */
 	List<BidingItems> getBidingItems(Biding biding, Integer distinguish);
 
 	/**
+	 * 删除订单明细
+	 * @param bidingItems
+	 */
+	void updateItems(BidingItems bidingItems);
+
+	/**
 	 * 更新状态
-	 *
 	 * @param id
+	 * @return
 	 */
 	void updateByPid(Long id);
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingItemsServiceImpl.java

@@ -2,12 +2,15 @@ package org.springblade.purchase.sales.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import io.seata.common.util.CollectionUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.purchase.sales.entity.Biding;
 import org.springblade.purchase.sales.entity.BidingItems;
 import org.springblade.purchase.sales.mapper.BidingItemsMapper;
+import org.springblade.purchase.sales.mapper.BidingMapper;
 import org.springblade.purchase.sales.service.IBidingItemsService;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +28,7 @@ import java.util.List;
 @AllArgsConstructor
 public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, BidingItems> implements IBidingItemsService {
 
+	private final BidingMapper bidingMapper;
 
 	/**
 	 * 保存订单明细信息
@@ -75,6 +79,47 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 		return list;
 	}
 
+	/**
+	 * 删除订单明细
+	 * @param bidingItems
+	 */
+	@Override
+
+	public void updateItems(BidingItems bidingItems){
+		BidingItems items = baseMapper.selectById(bidingItems.getId());
+		//明细不存在
+		if (items == null){
+			throw new SecurityException("数据异常");
+		}
+
+		//删除数据
+		items.setIsDeleted(1);
+		baseMapper.updateById(items);
+
+		//修改主表箱型箱量字段
+		LambdaQueryWrapper<BidingItems> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(BidingItems::getTenantId, AuthUtil.getTenantId());
+		lambdaQueryWrapper.eq(BidingItems::getIsDeleted, 0);
+		lambdaQueryWrapper.eq(BidingItems::getPid, items.getPid());
+		List<BidingItems> list = baseMapper.selectList(lambdaQueryWrapper);
+		StringBuilder boxTypeQuantity = new StringBuilder();
+		Biding biding = new Biding();
+		biding.setId(items.getId());
+		if (CollectionUtils.isNotEmpty(list)){
+			list.forEach(e -> {
+				if (StringUtil.isNotBlank(e.getBoxType())){
+					boxTypeQuantity.append(e.getBoxType()).append("*").append(e.getBoxAmount()).append(",");
+				}
+			});
+			biding.setBoxTypeQuantity(boxTypeQuantity.toString().substring(0, boxTypeQuantity.toString().length() - 1));
+		}else {
+			biding.setBoxTypeQuantity("");
+		}
+
+		bidingMapper.updateById(biding);
+
+	}
+
 	@Override
 	public void updateByPid(Long id) {
 		baseMapper.updateByPid(id);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -106,6 +107,10 @@ public class BidingServiceImpl extends ServiceImpl<BidingMapper, Biding> impleme
 	 */
 	@Override
 	public IPage<Biding> appPage(IPage<Biding> page, Biding biding){
+		Date date = new Date();
+		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		String formattedDate = df.format(date);
+		biding.setDeadlineBeginTime(formattedDate);
 		List<Biding> list = baseMapper.salaryBiding(biding, page);
 		return page.setRecords(list);
 	}