Skip to content

Commit 98a0dc7

Browse files
author
ehowlsla
committed
문자보내기, 사전예약, 결제폼 정리 후 커밋
1 parent ca75c40 commit 98a0dc7

File tree

9 files changed

+108
-35
lines changed

9 files changed

+108
-35
lines changed

‎bootpay/src/main/java/kr/co/bootpay/BootpayBuilder.java‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import kr.co.bootpay.model.BootExtra;
2626
import kr.co.bootpay.model.Item;
2727
import kr.co.bootpay.model.RemoteLink;
28+
import kr.co.bootpay.model.RemoteOrderForm;
29+
import kr.co.bootpay.model.RemoteOrderPre;
2830
import kr.co.bootpay.model.Request;
2931
import kr.co.bootpay.model.BootUser;
3032
import kr.co.bootpay.model.SMSPayload;
@@ -167,7 +169,7 @@ public BootpayBuilder setOrderId(String orderId) {
167169
return this;
168170
}
169171

170-
public BootpayBuilder setUseOrderId(Integer use_order_id) {
172+
public BootpayBuilder setUseOrderId(boolean use_order_id) {
171173
request.setUse_order_id(use_order_id);
172174
return this;
173175
}
@@ -182,11 +184,21 @@ public BootpayBuilder setBootExtra(BootExtra bootExtra) {
182184
return this;
183185
}
184186

185-
public BootpayBuilder setRemoteLinkInfo(RemoteLink remoteLink) {
187+
public BootpayBuilder setRemoteLink(RemoteLink remoteLink) {
186188
request.setRemoteLink(remoteLink);
187189
return this;
188190
}
189191

192+
public BootpayBuilder setRemoteForm(RemoteOrderForm remoteForm) {
193+
request.setRemoteForm(remoteForm);
194+
return this;
195+
}
196+
197+
public BootpayBuilder setRemotePre(RemoteOrderPre remotePre) {
198+
request.setRemotePre(remotePre);
199+
return this;
200+
}
201+
190202
// public BootpayBuilder setExpireMonth(int expireMonth) {
191203
// request.setExtra_expire_month(expireMonth);
192204
// return this;
@@ -219,7 +231,7 @@ public BootpayBuilder setMethods(List<String> methods) {
219231
return this;
220232
}
221233

222-
public BootpayBuilder setSmsUse(Integer sms_use) {
234+
public BootpayBuilder setSmsUse(Boolean sms_use) {
223235
request.setSmsUse(sms_use);
224236
return this;
225237
}

‎bootpay/src/main/java/kr/co/bootpay/api/BootpayPresenter.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ internal class BootpayPresenter(context: Context) {
7373
fun request_form(request: Request) {
7474
var userJson = request.bootUser?.toGson() ?: ""
7575
var extraJson = request.bootExtra?.toGson() ?: ""
76-
var remoteFormJson = request.remote_form?.toGson() ?: ""
76+
var remoteFormJson = request.remoteForm?.toGson() ?: ""
7777
var methods = request.methods ?: mutableListOf()
7878
var sms_payload = request.smsPayload?.toGson() ?: ""
7979

@@ -82,7 +82,7 @@ internal class BootpayPresenter(context: Context) {
8282
request.methods?.let { form.setMethods(it) }
8383
remoteFormJson = form.toGson()
8484
} else {
85-
request.remote_form?.let {
85+
request.remoteForm?.let {
8686
if(it.pg.isEmpty()) { it.pg = request.pg }
8787
if(it.fm.size == 0) { request.methods?.let { methods -> it.fm = methods }}
8888
if(it.ip == 0.0) { it.ip = request.price }
@@ -128,7 +128,7 @@ internal class BootpayPresenter(context: Context) {
128128
fun request_pre(request: Request) {
129129
var userJson = request.bootUser?.toGson() ?: ""
130130
var extraJson = request.bootExtra?.toGson() ?: ""
131-
var remotePreJson = request.remote_pre?.toGson() ?: ""
131+
var remotePreJson = request.remotePre?.toGson() ?: ""
132132
var methods = request.methods ?: mutableListOf()
133133
var sms_payload = request.smsPayload?.toGson() ?: ""
134134

‎bootpay/src/main/java/kr/co/bootpay/api/BootpayRestApi.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ internal interface BootpayRestApi {
2828
@Field("boot_key") boot_key: String,
2929
@Field("params") params: String,
3030
@Field("order_id") order_id: String,
31-
@Field("use_order_id") use_order_id: Int,
31+
@Field("use_order_id") use_order_id: Boolean,
3232
@Field("account_expire_at") account_expire_at: String,
3333
@Field("bootExtra") extra: String,
3434
@Field("remote_link") remote_link: String,
35-
@Field("sms_use") sms_use: Int,
35+
@Field("sms_use") sms_use: Boolean,
3636
@Field("sms_payload") sms_payload: String
3737
): Observable<ResDefault>
3838

@@ -57,11 +57,11 @@ internal interface BootpayRestApi {
5757
@Field("boot_key") boot_key: String,
5858
@Field("params") params: String,
5959
@Field("order_id") order_id: String,
60-
@Field("use_order_id") use_order_id: Int,
60+
@Field("use_order_id") use_order_id: Boolean,
6161
@Field("account_expire_at") account_expire_at: String,
6262
@Field("bootExtra") extra: String,
6363
@Field("remote_form") remote_form: String,
64-
@Field("sms_use") sms_use: Int,
64+
@Field("sms_use") sms_use: Boolean,
6565
@Field("sms_payload") sms_payload: String
6666
): Observable<ResDefault>
6767

@@ -86,11 +86,11 @@ internal interface BootpayRestApi {
8686
@Field("boot_key") boot_key: String,
8787
@Field("params") params: String,
8888
@Field("order_id") order_id: String,
89-
@Field("use_order_id") use_order_id: Int,
89+
@Field("use_order_id") use_order_id: Boolean,
9090
@Field("account_expire_at") account_expire_at: String,
9191
@Field("bootExtra") extra: String,
9292
@Field("remote_pre") remote_pre: String,
93-
@Field("sms_use") sms_use: Int,
93+
@Field("sms_use") sms_use: Boolean,
9494
@Field("sms_payload") sms_payload: String
9595
): Observable<ResDefault>
9696
}

‎bootpay/src/main/java/kr/co/bootpay/model/RemoteOrderPre.kt‎

Lines changed: 42 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,52 @@ class RemoteOrderPre {
88
var is_r_n = false //구매자명 입력을 허용할지 말지, is_receive_name
99

1010
var is_sale = false
11-
var s_at = Long // 예약 시작일
12-
var e_at = Long // 예약 종료일
11+
var s_at = System.currentTimeMillis() // 예약 시작일
12+
var e_at = 0L
1313
var desc_html = ""
1414

1515
var n = "" //상품명, name
1616
var cn = "" //company_name, 업체명
1717

18+
fun setExpectedPrice(value: String): RemoteOrderPre {
19+
e_p = value
20+
return this
21+
}
22+
23+
fun setIsReceiveName(value: Boolean): RemoteOrderPre {
24+
is_r_n = value
25+
return this
26+
}
27+
28+
fun setIsSale(value: Boolean): RemoteOrderPre {
29+
is_sale = value
30+
return this
31+
}
32+
33+
fun setStartAt(value: Long): RemoteOrderPre {
34+
s_at = value
35+
return this
36+
}
37+
38+
fun setEndAt(value: Long): RemoteOrderPre {
39+
e_at = value
40+
return this
41+
}
42+
43+
fun setDescHtml(value: String): RemoteOrderPre {
44+
desc_html = value
45+
return this
46+
}
47+
48+
fun setName(value: String): RemoteOrderPre {
49+
n = value
50+
return this
51+
}
52+
53+
fun setCompanyName(value: String): RemoteOrderPre {
54+
cn = value
55+
return this
56+
}
57+
1858
fun toGson() = Gson().toJson(this)
1959
}

‎bootpay/src/main/java/kr/co/bootpay/model/Request.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class Request {
1919
var tax_free: Double = 0.0 //비과세금액 (결제금액 - 과세금액 = 비과세금액)
2020

2121
var order_id: String = "" // 개발사가 발급한 고유 주문번호 (중복되지 않게 발급해야한다)
22-
var use_order_id: Int = 0 // PG사 전산에서 개발사의 order_id를 key로 사용할지 여부 (기본값은 사용하지 않는다 = 부트페이가 발급한 키로 사용한다)
22+
var use_order_id = false // PG사 전산에서 개발사의 order_id를 key로 사용할지 여부 (기본값은 사용하지 않는다 = 부트페이가 발급한 키로 사용한다)
2323
var params: String? = null // 개발사 -> 부트페이로 보낼 파라미터, 결제 후 부트페이 -> 개발사로 동일하게 리턴해줌
2424

2525

@@ -36,10 +36,10 @@ class Request {
3636
var bootUser: BootUser? = null
3737
var bootExtra: BootExtra? = null
3838
var remoteLink: RemoteLink? = null
39-
var remote_form: RemoteOrderForm? = null
40-
var remote_pre: RemoteOrderPre? = null
39+
var remoteForm: RemoteOrderForm? = null
40+
var remotePre: RemoteOrderPre? = null
4141
var smsPayload: SMSPayload? = null
42-
var smsUse = 0
42+
var smsUse = false
4343

4444

4545
fun addItem(item: Item): MutableList<Item> {

‎sample/src/main/java/bootpay/co/kr/samplepayment/FlutterActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void startTrace() {
5858
}
5959

6060
public void onClick_request(View v) {
61-
BootUser bootUser = new BootUser().setPhone("010-4033-4678");
61+
BootUser bootUser = new BootUser().setPhone("010-1234-5678");
6262
BootExtra bootExtra = new BootExtra().setQuotas(new int[] {0,2,3});
6363

6464
// 결제호출

‎sample/src/main/java/bootpay/co/kr/samplepayment/MainActivity.java‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import kr.co.bootpay.model.BootExtra;
3030
import kr.co.bootpay.model.BootUser;
3131
import kr.co.bootpay.model.RemoteOrderForm;
32+
import kr.co.bootpay.model.RemoteOrderPre;
3233
import kr.co.bootpay.model.SMSPayload;
3334

3435
public class MainActivity extends AppCompatActivity {
@@ -230,9 +231,9 @@ public void goFlutterActivity(View v) {
230231
}
231232

232233
public void goRemoteLink(View v) {
233-
BootUser bootUser = new BootUser().setPhone("010-4033-4678");
234+
BootUser bootUser = new BootUser().setPhone("010-1234-5678");
234235
BootExtra bootExtra = new BootExtra().setQuotas(new int[] {0,2,3});
235-
SMSPayload payload = new SMSPayload().setMessage("결제링크 안내입니다\n[결제링크]").setSenderPhone("010-4033-4678").setReceieverPhones(Arrays.asList("01040334678"));
236+
SMSPayload payload = new SMSPayload().setMessage("결제링크 안내입니다\n[결제링크]").setSenderPhone("010-1234-5678").setReceieverPhones(Arrays.asList("010-1234-5678"));
236237

237238
// 결제호출
238239
Bootpay.init(getFragmentManager())
@@ -249,20 +250,17 @@ public void goRemoteLink(View v) {
249250
// .setAccountExpireAt("2018-09-22") // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )
250251
// .setQuotas(new int[] {0,2,3}) // 일시불, 2개월, 3개월 할부 허용, 할부는 최대 12개월까지 사용됨 (5만원 이상 구매시 할부허용 범위)
251252
.setPrice(10000) // 결제할 금액
252-
.setSmsUse(1)
253+
.setSmsUse(true)
253254
.setSMSPayload(payload)
254255
.addItem("마우's 스", 1, "ITEM_CODE_MOUSE", 100) // 주문정보에 담길 상품정보, 통계를 위해 사용
255256
.addItem("키보드", 1, "ITEM_CODE_KEYBOARD", 200, "패션", "여성상의", "블라우스") // 주문정보에 담길 상품정보, 통계를 위해 사용
256257
.request();
257258
}
258259

259260
public void goRemoteForm(View v) {
260-
BootUser bootUser = new BootUser().setPhone("010-4033-4678");
261+
BootUser bootUser = new BootUser().setPhone("010-1234-5678");
261262
BootExtra bootExtra = new BootExtra().setQuotas(new int[] {0,2,3});
262-
SMSPayload payload = new SMSPayload().setMessage("결제링크 안내입니다\n[결제링크]").setSenderPhone("010-4033-4678").setReceieverPhones(Arrays.asList("01040334678"));
263-
264-
// RemoteOrderForm orderForm = new RemoteOrderForm().setName("초코파이");
265-
263+
SMSPayload payload = new SMSPayload().setMessage("결제링크 안내입니다\n[결제링크]").setSenderPhone("010-1234-5678").setReceieverPhones(Arrays.asList("01040334678"));
266264

267265

268266
// 결제호출
@@ -280,14 +278,38 @@ public void goRemoteForm(View v) {
280278
// .setAccountExpireAt("2018-09-22") // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )
281279
// .setQuotas(new int[] {0,2,3}) // 일시불, 2개월, 3개월 할부 허용, 할부는 최대 12개월까지 사용됨 (5만원 이상 구매시 할부허용 범위)
282280
.setPrice(10000) // 결제할 금액
283-
.setSmsUse(1)
281+
.setSmsUse(true)
284282
.setSMSPayload(payload)
285283
.addItem("마우's 스", 1, "ITEM_CODE_MOUSE", 100) // 주문정보에 담길 상품정보, 통계를 위해 사용
286284
.addItem("키보드", 1, "ITEM_CODE_KEYBOARD", 200, "패션", "여성상의", "블라우스") // 주문정보에 담길 상품정보, 통계를 위해 사용
287285
.request();
288286
}
289287

290288
public void goRemotePre(View v) {
289+
BootExtra bootExtra = new BootExtra().setQuotas(new int[] {0,2,3});
290+
SMSPayload payload = new SMSPayload().setMessage("결제링크 안내입니다\n[결제링크]").setSenderPhone("010-4033-4678").setReceieverPhones(Arrays.asList("01040334678"));
291+
RemoteOrderPre pre = new RemoteOrderPre().setName("사전예약 이벤트").setExpectedPrice("10만원 이하");
292+
293+
294+
// 결제호출
295+
Bootpay.init(getFragmentManager())
296+
.setContext(this)
297+
.setApplicationId(application_id) // 해당 프로젝트(안드로이드)의 application id 값
298+
.setBootExtra(bootExtra)
299+
.setUX(UX.BOOTPAY_REMOTE_PRE)
300+
// .setUserPhone("010-1234-5678") // 구매자 전화번호
301+
.setName("맥\"북프로's 임다") // 결제할 상품명
302+
.setOrderId("1234") // 결제 고유번호expire_month
303+
.setRemotePre(pre)
304+
// .setAccountExpireAt("2018-09-22") // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )
305+
// .setQuotas(new int[] {0,2,3}) // 일시불, 2개월, 3개월 할부 허용, 할부는 최대 12개월까지 사용됨 (5만원 이상 구매시 할부허용 범위)
306+
307+
.setPrice(10000) // 결제할 금액
308+
.setSmsUse(true)
309+
.setSMSPayload(payload)
310+
.addItem("마우's 스", 1, "ITEM_CODE_MOUSE", 100) // 주문정보에 담길 상품정보, 통계를 위해 사용
311+
.addItem("키보드", 1, "ITEM_CODE_KEYBOARD", 200, "패션", "여성상의", "블라우스") // 주문정보에 담길 상품정보, 통계를 위해 사용
312+
.request();
291313

292314
}
293315
}

‎sample/src/main/java/bootpay/co/kr/samplepayment/NativeActivity.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,18 @@ public void startTrace() {
5858
}
5959

6060
public void onClick_request(View v) {
61-
BootUser bootUser = new BootUser().setPhone("010-4033-4678");
61+
BootUser bootUser = new BootUser().setPhone("010-1234-5678");
6262
BootExtra bootExtra = new BootExtra().setQuotas(new int[] {0,2,3});
6363

6464
// 결제호출
6565
Bootpay.init(getFragmentManager())
6666
.setApplicationId("5b14c0ffb6d49c40cda92c4e") // 해당 프로젝트(안드로이드)의 application id 값
6767
.setPG(PG.DANAL) // 결제할 PG 사
6868
.setContext(this)
69-
.setUX(UX.BOOTPAY_REMOTE_LINK)
7069
.setBootUser(bootUser)
7170
.setBootExtra(bootExtra)
7271
// .setUserPhone("010-1234-5678") // 구매자 전화번호
73-
.setMethod(Method.AUTH) // 결제수단
72+
.setMethod(Method.CARD) // 결제수단
7473
.setName("맥\"북프로's 임다") // 결제할 상품명
7574
.setOrderId("1234") // 결제 고유번호expire_month
7675
// .setAccountExpireAt("2018-09-22") // 가상계좌 입금기간 제한 ( yyyy-mm-dd 포멧으로 입력해주세요. 가상계좌만 적용됩니다. 오늘 날짜보다 더 뒤(미래)여야 합니다 )
@@ -119,6 +118,6 @@ public void onClose(String message) {
119118
Log.d("close", "close");
120119
}
121120
})
122-
.show();
121+
.request();
123122
}
124123
}

‎sample/src/main/res/layout/activity_main.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,15 @@
168168
android:orientation="horizontal">
169169

170170
<Button
171-
android:text="RetmoteLink"
171+
android:text="Retmote Link"
172172
android:layout_weight="1"
173173
android:background="#4529e5"
174174
android:textColor="#fff"
175175
android:onClick="goRemoteLink"
176176
android:layout_width="match_parent"
177177
android:layout_height="40dp" />
178178
<Button
179-
android:text="RemoteForm"
179+
android:text="Remote Form"
180180
android:layout_weight="1"
181181
android:onClick="goRemoteForm"
182182
android:layout_marginRight="5dp"
@@ -186,7 +186,7 @@
186186
android:layout_width="match_parent"
187187
android:layout_height="40dp" />
188188
<Button
189-
android:text="RemoteForm"
189+
android:text="Remote Pre"
190190
android:layout_weight="1"
191191
android:onClick="goRemotePre"
192192
android:background="#4529e5"

0 commit comments

Comments
 (0)