修复无规格商品问题

src/main/java/org/springblade/modules/api/controller/Api05Controller.java

@@ -108,6 +108,7 @@ public class Api05Controller extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "购买商品", notes = "传入用户ID")
 	public R orderCommonSave(@Valid @RequestBody OrderCommonSaveRequest request) {
+		//租户号
 		String tenantId = WebUtil.getRequest().getHeader(TokenUtil.TENANT_HEADER_KEY);
 		if(StringUtil.isEmpty(request.getDistributeMode())){
 			request.setDistributeMode(2); //物流配送
@@ -233,7 +234,7 @@ public class Api05Controller extends BladeController {
 			}
 		}
 		IPage<Order> pages = orderService.page(Condition.getPage(query),
-			Condition.getQueryWrapper(order).orderByAsc("create_time"));
+			Condition.getQueryWrapper(order).orderByDesc("create_time"));
 		return R.data(OrderWrapper.build().listVO(pages.getRecords()));
 	}
 

src/main/java/org/springblade/modules/finance/service/impl/OrderServiceImpl.java

@@ -132,7 +132,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		Order order = new Order();
 		order.setTenantId(tenantId);
 		if(user != null){
-			order.setUserName(user.getName());
+			order.setUserName(request.getReceivingName());
 		}
 		order.setOutTradeNo(outTradeNo);
 		order.setUserId(query.getUserId());
@@ -179,6 +179,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						orderGoods.setGoodsImg(specItems.getItemImg());
 					}
 				}
+			}else{
+				//获取商品规格数据
+				orderGoods.setGoodsPrice(goods.getGoodsPrice());
+				ticketNum = goods.getGoodsPrice();
+				orderGoods.setGoodsSpecNames(goods.getGoodsName());
+				orderGoods.setGoodsImg(goods.getGoodsImg());
 			}
 			orderGoods.setOutTradeNo(outTradeNo);
 			orderGoods.setGoodsImg(goods.getGoodsImg());