Merge branch 'master-zjw' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -759,7 +759,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 
 			try {
-				this.updateSelectiveByIdRe(updateOrder);
+				BeanUtil.copyProperties(this.updateSelectiveByIdReT(updateOrder), baseOrder);
 				//记录订单账款记录
 				Integer flag = orderAccountBiz.addOrderAccount(baseOrder.getId(), "订单支付", oad.getOriginOrderAmount().add(oad.getOriginDepositAmount()), oad.getOrderAmount().add(oad.getDepositAmount()), tradeNo, AccountTypeEnum.IN_ORDER_PAY.getCode(), JSONUtil.toJsonStr(oad));
 			} finally {
@@ -775,6 +775,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
 					sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_FINISH);
 					//订单完成时，payway为 支付宝，则转支付
+					baseOrder.setPayWay(payWay);
 					orderAccountBiz.finishFreeze2PayAmount(baseOrder);
 				}
 			}