Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

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

@@ -451,9 +451,9 @@ public class Order implements Serializable {
 	@TableField(exist = false)
 	private String updateUserName;
 	/**
-	 * 客户中文名
+	 * 回显客户中文名
 	 */
-	@ApiModelProperty(value = "客户中文名")
+	@ApiModelProperty(value = "回显客户中文名")
 	@TableField(exist = false)
 	private List<Map<String,Object>> corpName;
 	/**
@@ -543,6 +543,11 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "信用证金额")
 	private BigDecimal creditAmount;
+	/**
+	 * 订单状态
+	 */
+	@ApiModelProperty(value = "订单状态")
+	private String orderStatus;
 
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/OrderVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.purchase.sales.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.springblade.purchase.sales.entity.Order;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,5 +33,10 @@ import io.swagger.annotations.ApiModel;
 @ApiModel(value = "OrderVO对象", description = "销售或采购订单表")
 public class OrderVO extends Order {
 	private static final long serialVersionUID = 1L;
+	/**
+	 * 列表客户中文名
+	 */
+	@ApiModelProperty(value = "列表客户中文名")
+	private String corpsName;
 
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/dto/OrderSubmitDto.java

@@ -27,12 +27,6 @@ public class OrderSubmitDto extends Order {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 订单状态
-	 */
-	@ApiModelProperty(value = "订单状态")
-	private OrderStatusEnum orderStatus;
-
-	/**
 	 * 订单类型
 	 */
 	@ApiModelProperty(value = "订单类型")

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -470,5 +470,10 @@ public class Order extends OrderBase {
 	 */
 	@ApiModelProperty(value = "信用证金额")
 	private BigDecimal creditAmount;
+	/**
+	 * 订单状态
+	 */
+	@ApiModelProperty(value = "订单状态")
+	private String orderStatus;
 
 }

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

@@ -92,10 +92,11 @@
         <result column="marks" property="marks"/>
         <result column="credit_number" property="creditNumber"/>
         <result column="credit_amount" property="creditAmount"/>
+        <result column="order_status" property="orderStatus"/>
     </resultMap>
 
 
-    <select id="selectOrderPage" resultMap="orderResultMap">
+    <select id="selectOrderPage" resultType="org.springblade.purchase.sales.vo.OrderVO">
         select * from business_order where is_deleted = 0
         <if test="Order.id!=null">
             and id = #{Order.id}

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

@@ -65,7 +65,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	@Override
 	public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
-		return page.setRecords(baseMapper.selectOrderPage(page, order));
+		List<OrderVO> orderVOList = baseMapper.selectOrderPage(page, order);
+		if (CollectionUtils.isNotEmpty(orderVOList)){
+			orderVOList.stream().forEach(item ->{
+				if (item.getCorpId() != null){
+					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getCorpId());
+					if (corpMessage.isSuccess() && corpMessage.getData() != null){
+						item.setCorpsName(corpMessage.getData().getCname());
+					}
+				}
+			});
+		}
+		return page.setRecords(orderVOList);
 	}
 	@Override
 	@Transactional

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/component/impl/DefaultOrderSaveImpl.java

@@ -55,11 +55,11 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		// 保存订单
 		Order order = saveOrder(orderSubmitDto);
 		// 保存子订单
-		saveItem(orderSubmitDto.getItemsVOList(), orderSubmitDto.getDelItemIds(), orderSubmitDto.getOrderStatus(), order.getId());
+		saveItem(orderSubmitDto.getItemsVOList(), orderSubmitDto.getDelItemIds(),order.getId());
 		// 保存费用信息
-		saveFees(orderSubmitDto.getOrderFeesList(), orderSubmitDto.getDelFeesIds(), orderSubmitDto.getOrderStatus(), order.getId());
+		saveFees(orderSubmitDto.getOrderFeesList(), orderSubmitDto.getDelFeesIds(),order.getId());
 		// 保存文件信息
-		saveFiles(orderSubmitDto.getOrderFilesList(), orderSubmitDto.getDelFilesIds(), orderSubmitDto.getOrderStatus(), order.getId());
+		saveFiles(orderSubmitDto.getOrderFilesList(), orderSubmitDto.getDelFilesIds(),order.getId());
 	}
 
 	/**
@@ -68,7 +68,6 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 	 * @param order
 	 */
 	private Order saveOrder(OrderSubmitDto order) {
-		order.setStatus(order.getOrderStatus().getStatus());
 		order.setBillType(order.getOrderTypeEnum().getType());
 		order.setTradeType(order.getTradeTypeEnum().getType());
 		if (Func.isBlank(order.getSysNo())) {
@@ -97,10 +96,9 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 	 *
 	 * @param itemsVOList
 	 * @param delItemIds
-	 * @param orderStatus
 	 * @param id
 	 */
-	private void saveItem(List<OrderItemsVO> itemsVOList, List<Long> delItemIds, OrderStatusEnum orderStatus, Long id) {
+	private void saveItem(List<OrderItemsVO> itemsVOList, List<Long> delItemIds, Long id) {
 		// 删除需要删除的明细id
 		if (CollectionUtils.isNotEmpty(delItemIds)) {
 			orderItemsMapper.deleteBatchIds(delItemIds);
@@ -108,7 +106,6 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		if (CollectionUtils.isNotEmpty(itemsVOList)) {
 			itemsVOList.forEach(li -> {
 				li.setPid(id);
-				li.setStatus(orderStatus.getStatus());
 				if (Objects.isNull(li.getId())) {
 					li.setCreateTime(new Date());
 					li.setCreateUser(AuthUtil.getUserId());
@@ -127,10 +124,9 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 	 *
 	 * @param feesList
 	 * @param delFeesIds
-	 * @param orderStatus
 	 * @param id
 	 */
-	private void saveFees(List<OrderFees> feesList, List<Long> delFeesIds, OrderStatusEnum orderStatus, Long id) {
+	private void saveFees(List<OrderFees> feesList, List<Long> delFeesIds,Long id) {
 		// 删除需要删除的明细id
 		if (CollectionUtils.isNotEmpty(delFeesIds)) {
 			orderFeesMapper.deleteBatchIds(delFeesIds);
@@ -138,7 +134,6 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		if (CollectionUtils.isNotEmpty(feesList)) {
 			feesList.forEach(li -> {
 				li.setPid(id);
-				li.setStatus(orderStatus.getStatus());
 				if (Objects.isNull(li.getId())) {
 					li.setCreateTime(new Date());
 					li.setCreateUser(AuthUtil.getUserId());
@@ -157,10 +152,9 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 	 *
 	 * @param filesList
 	 * @param delFilesIds
-	 * @param orderStatus
 	 * @param id
 	 */
-	private void saveFiles(List<OrderFiles> filesList, List<Long> delFilesIds, OrderStatusEnum orderStatus, Long id) {
+	private void saveFiles(List<OrderFiles> filesList, List<Long> delFilesIds,Long id) {
 		// 删除需要删除的明细id
 		if (CollectionUtils.isNotEmpty(delFilesIds)) {
 			orderFilesMapper.deleteBatchIds(delFilesIds);
@@ -168,7 +162,6 @@ public class DefaultOrderSaveImpl implements IOrderSave {
 		if (CollectionUtils.isNotEmpty(filesList)) {
 			filesList.forEach(li -> {
 				li.setPid(id);
-				li.setStatus(orderStatus.getStatus());
 				if (Objects.isNull(li.getId())) {
 					li.setCreateTime(new Date());
 					li.setCreateUser(AuthUtil.getUserId());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -92,6 +92,7 @@
         <result column="marks" property="marks"/>
         <result column="credit_number" property="creditNumber"/>
         <result column="credit_amount" property="creditAmount"/>
+        <result column="order_status" property="orderStatus"/>
     </resultMap>
 
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -123,7 +123,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Transactional(rollbackFor = Exception.class)
 	public R<String> saveOrderMessage(OrderSubmitDto submitDto) {
 		// 落库
-		submitDto.setOrderStatus(OrderStatusEnum.PAUSE);
 		orderSave.save(submitDto);
 		// todo:: 是否需要加日志
 		return R.status(true);
@@ -139,7 +138,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Transactional(rollbackFor = Exception.class)
 	public R<String> submitOrderMessage(OrderSubmitDto submitDto) {
 		// 落库
-		submitDto.setOrderStatus(OrderStatusEnum.SUBMIT);
 		orderSave.save(submitDto);
 		// todo:: 是否需要加日志
 		return R.status(true);