优化代码

java110-bean/src/main/java/com/java110/dto/storeOrderCart/StoreOrderCartDto.java

@@ -20,6 +20,7 @@ public class StoreOrderCartDto extends PageDto implements Serializable {
 
     private String valueId;
     private String productId;
+    private String prodName;
     private String orderId;
     private String cartId;
     private String remark;
@@ -28,7 +29,9 @@ public class StoreOrderCartDto extends PageDto implements Serializable {
     private String price;
     private String payPrice;
     private String personId;
+    private String personName;
     private String state;
+    private String stateName;
     private String freightPrice;
 
 
@@ -149,4 +152,28 @@ public class StoreOrderCartDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getProdName() {
+        return prodName;
+    }
+
+    public void setProdName(String prodName) {
+        this.prodName = prodName;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
 }

java110-db/src/main/resources/mapper/goods/StoreOrderCartServiceDaoImplMapper.xml

@@ -20,8 +20,12 @@
         select t.value_id,t.value_id valueId,t.product_id,t.product_id productId,t.order_id,t.order_id
         orderId,t.cart_id,t.cart_id cartId,t.remark,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id
         storeId,t.cart_num,t.cart_num cartNum,t.price,t.pay_price,t.pay_price payPrice,t.person_id,t.person_id
-        personId,t.state,t.freight_price,t.freight_price freightPrice
+        personId,t.state,t.freight_price,t.freight_price freightPrice,p.prod_name prodName,so.person_name personName,
+        td.name stateName,t.create_time createTime
         from store_order_cart t
+        left join store_order so on t.order_id = so.order_id
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'store_order_cart' and td.table_columns = 'state'
+        left join product p on t.product_id = p.product_id and p.status_cd = '0'  and p.store_id = t.store_id
         where 1 =1
         <if test="valueId !=null and valueId != ''">
             and t.value_id= #{valueId}

service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -925,7 +925,7 @@ public class AssetImportSMOImpl extends BaseComponentSMO implements IAssetImport
                 owners.add(importOwner);
             } catch (Exception e) {
                 logger.error("第" + (osIndex + 1) + "行数据出现问题", e);
-                throw e;
+                throw new IllegalArgumentException("第" + (osIndex + 1) + "行数据出现问题"+e.getLocalizedMessage(),e);
             }
         }
     }

service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java

@@ -29,11 +29,7 @@ import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 商户订单
@@ -313,11 +309,15 @@ public class StoreOrderApi {
      */
     @RequestMapping(value = "/queryStoreOrderCart", method = RequestMethod.GET)
     public ResponseEntity<String> queryStoreOrderCart(
+            @RequestHeader(value = "store-id", required = false) String storeId,
+            @RequestParam(value = "personId", required = false) String personId,
             @RequestParam(value = "page") int page,
             @RequestParam(value = "row") int row) {
         StoreOrderCartDto storeOrderCartDto = new StoreOrderCartDto();
         storeOrderCartDto.setPage(page);
         storeOrderCartDto.setRow(row);
+        storeOrderCartDto.setStoreId(storeId);
+        storeOrderCartDto.setPersonId(personId);
         return getStoreOrderCartBMOImpl.get(storeOrderCartDto);
     }