Browse Source

매장단가 리스트 출력 오류 수정

dwkim 2 years ago
parent
commit
2f234a7a90

+ 1 - 1
src/main/java/com/oqpo/api/web/controller/stinfo/StoreController.java

@@ -44,7 +44,7 @@ public class StoreController {
44
     @ApiImplicitParams({
44
     @ApiImplicitParams({
45
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
45
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
46
     })
46
     })
47
-    @ApiOperation(value = " 팝업 메징 그리드 리스트")
47
+    @ApiOperation(value = " 팝업 매장 그리드 리스트")
48
     @PostMapping("/pop-grid-list")
48
     @PostMapping("/pop-grid-list")
49
     public ResponseEntity<GridResponse> brandPopGridList(@RequestBody @Valid StorePopGridRequest storePopGridRequest) throws Exception {
49
     public ResponseEntity<GridResponse> brandPopGridList(@RequestBody @Valid StorePopGridRequest storePopGridRequest) throws Exception {
50
         return ResponseEntity.ok(storeBaseInfoService.selectPopBrandGridList(storePopGridRequest.getBrandId(), storePopGridRequest.getStoreNm(), storePopGridRequest.toDTO(storePopGridRequest)));
50
         return ResponseEntity.ok(storeBaseInfoService.selectPopBrandGridList(storePopGridRequest.getBrandId(), storePopGridRequest.getStoreNm(), storePopGridRequest.toDTO(storePopGridRequest)));

+ 0 - 1
src/main/java/com/oqpo/api/web/dto/response/pomng/pchReq/PchReqInfoResponse.java

@@ -7,7 +7,6 @@ import com.oqpo.api.entity.oper.UserMngEntity;
7
 import com.oqpo.api.entity.pomng.PchReqBaseInfoEntity;
7
 import com.oqpo.api.entity.pomng.PchReqBaseInfoEntity;
8
 import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
8
 import com.oqpo.api.entity.pomng.PchReqDtlPtclEntity;
9
 import com.oqpo.api.entity.stinfo.BrandEntity;
9
 import com.oqpo.api.entity.stinfo.BrandEntity;
10
-import com.oqpo.api.enums.PchReqApprCd;
11
 import io.swagger.annotations.ApiModelProperty;
10
 import io.swagger.annotations.ApiModelProperty;
12
 import lombok.*;
11
 import lombok.*;
13
 
12
 

+ 3 - 3
src/main/resources/mybatis/sqlmaps/stinfo/StoreItemUnit.xml

@@ -22,15 +22,15 @@
22
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
22
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
23
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
23
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
24
                     <if test="gridRequest.sord == 'asc'.toString()">
24
                     <if test="gridRequest.sord == 'asc'.toString()">
25
-                        order by iunit.store_nm asc
25
+                        order by store_nm asc
26
                     </if>
26
                     </if>
27
                     <if test="gridRequest.sord == 'desc'.toString()">
27
                     <if test="gridRequest.sord == 'desc'.toString()">
28
-                        order by iunit.store_nm desc
28
+                        order by store_nm desc
29
                     </if>
29
                     </if>
30
                 </if>
30
                 </if>
31
             </when>
31
             </when>
32
             <otherwise>
32
             <otherwise>
33
-                order by iunit.store_nm asc
33
+                order by store_nm asc
34
             </otherwise>
34
             </otherwise>
35
         </choose>
35
         </choose>
36
         <if test="gridRequest.pagingYn == true">
36
         <if test="gridRequest.pagingYn == true">