|
@@ -20,6 +20,7 @@ import com.hcloud.microserver.h5.facade.carbon.forms.*;
|
|
|
import io.swagger.annotations.*;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
@@ -113,7 +114,9 @@ public class OrderManagerController extends CarbonBaseController {
|
|
|
for (GoodsOrderInfoForm form : orderInfoFormList) {
|
|
|
String guid = form.getGuid();
|
|
|
List<GoodsOrderDetailForm> detailFormList = orderDetailInfoService.getOrderDetailListByOrderId(guid);
|
|
|
- form.setGoodsOrderDetailForm(detailFormList);
|
|
|
+ if(!StringUtils.isEmpty(detailFormList)){
|
|
|
+ form.setGoodsOrderDetailForm(detailFormList);
|
|
|
+ }
|
|
|
}
|
|
|
return success(orderInfoFormList, pageInfo.getTotal());
|
|
|
}
|