Browse Source

푸시기능수정

dwkim 2 years ago
parent
commit
37a4515987

+ 3 - 1
src/main/java/com/oqpo/api/service/PushService.java

@@ -75,11 +75,13 @@ public class PushService  extends CommonService {
75
                 }
75
                 }
76
                 if ("PO".equals(jobType)) {
76
                 if ("PO".equals(jobType)) {
77
                     dataSA.put("body", PushMessage.PUSH_REQ.getName());
77
                     dataSA.put("body", PushMessage.PUSH_REQ.getName());
78
+                    dataSA.put("data", "PO");
78
                 } else {
79
                 } else {
79
                     dataSA.put("body", PushMessage.PUSH_RTN.getName());
80
                     dataSA.put("body", PushMessage.PUSH_RTN.getName());
81
+                    dataSA.put("data", "RTN");
80
                 }
82
                 }
81
 
83
 
82
-                dataSA.put("click_action", ApiConstants.PUSH_ACTION);
84
+                //dataSA.put("click_action", ApiConstants.PUSH_ACTION);
83
                 //dataSA.put("data", entity.getPushLandingCd());
85
                 //dataSA.put("data", entity.getPushLandingCd());
84
                 //dataSA.put("relNo", entity.getLinkUrl());
86
                 //dataSA.put("relNo", entity.getLinkUrl());
85
                 bodySA.put("data", dataSA);
87
                 bodySA.put("data", dataSA);

+ 2 - 1
src/main/java/com/oqpo/api/service/pomng/PchReqService.java

@@ -332,8 +332,9 @@ public class PchReqService extends CommonService {
332
                 pchReqMapper.insertPchReqDtlPtcl(userId, gridInsertData) ;
332
                 pchReqMapper.insertPchReqDtlPtcl(userId, gridInsertData) ;
333
             }
333
             }
334
 
334
 
335
-
335
+            System.out.println("===============================================");
336
             PchReqBaseInfoEntity sumData = pchReqMapper.selectSumReqAmt(entity.getPchReqUnqNo());
336
             PchReqBaseInfoEntity sumData = pchReqMapper.selectSumReqAmt(entity.getPchReqUnqNo());
337
+            System.out.println("===============================================");
337
 
338
 
338
             // 구매요청(PR20)일경우 여신의 사용금액에 추가처리함  비교로직도 필요함
339
             // 구매요청(PR20)일경우 여신의 사용금액에 추가처리함  비교로직도 필요함
339
             if ("PD01".equals(entity.getPchReqDvsn())  &&  "PR20".equals(entity.getPchReqStCd())) {
340
             if ("PD01".equals(entity.getPchReqDvsn())  &&  "PR20".equals(entity.getPchReqStCd())) {

+ 2 - 2
src/main/resources/mybatis/sqlmaps/pomng/PchReq.xml

@@ -174,7 +174,7 @@
174
                 pch_req_dtl_ptcl SET
174
                 pch_req_dtl_ptcl SET
175
                     unit = #{item.unit},
175
                     unit = #{item.unit},
176
                     pch_req_qty = #{item.pchReqQty},
176
                     pch_req_qty = #{item.pchReqQty},
177
-                    pch_req_amt = #{item.pchReqAmt},
177
+                    pch_req_amt = #{item.unitAmt} * #{item.pchReqQty},
178
                     unit_amt = #{item.unitAmt},
178
                     unit_amt = #{item.unitAmt},
179
                     sys_chg_dttm = NOW(),
179
                     sys_chg_dttm = NOW(),
180
                     sys_chg_id = #{userId}
180
                     sys_chg_id = #{userId}
@@ -299,7 +299,7 @@
299
 
299
 
300
     <update id="updatePchReqStCd">
300
     <update id="updatePchReqStCd">
301
         <foreach collection="gridUpdateData" item="item" separator=";">
301
         <foreach collection="gridUpdateData" item="item" separator=";">
302
-            UPDATE /* PchReq.updatePchReqDtlPtcl */
302
+            UPDATE /* PchReq.updatePchReqStCd */
303
             pch_req_base_info SET
303
             pch_req_base_info SET
304
                 pch_req_st_cd = #{item.pchReqStCd},
304
                 pch_req_st_cd = #{item.pchReqStCd},
305
                 sys_chg_dttm = NOW(),
305
                 sys_chg_dttm = NOW(),