|
|
@@ -1,5 +1,6 @@
|
|
|
package com.style24.front.biz.web;
|
|
|
|
|
|
+import java.text.DecimalFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Collection;
|
|
|
|
|
|
@@ -1058,7 +1059,7 @@ public class TsfOrderController extends TsfBaseController {
|
|
|
|
|
|
int count = customerService.getGiftKakaoSendInfo(custContactHst);
|
|
|
|
|
|
- if (count < 1) {
|
|
|
+ if (count < 30) {
|
|
|
// 2021.05.31 알림톡전송 주문완료정보
|
|
|
if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
|
|
|
Integer userNo = orderInfo.getCustNo();
|
|
|
@@ -1067,10 +1068,44 @@ public class TsfOrderController extends TsfBaseController {
|
|
|
orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
|
|
|
kakaotalkService.sendOrderComplete(orderInfo, userNo);
|
|
|
|
|
|
+ GagaMap replaceInfo = new GagaMap();
|
|
|
+ DecimalFormat df = new DecimalFormat("###,###");
|
|
|
+
|
|
|
+ replaceInfo.set("ordSumAmt" , df.format(resultMap.getInt("ordSumAmt")));
|
|
|
+ replaceInfo.set("dcSumAmt" , df.format(resultMap.getInt("dcSumAmt")));
|
|
|
+ replaceInfo.set("realOrdSumAmt" , df.format(resultMap.getInt("realOrdSumAmt")));
|
|
|
+ replaceInfo.set("listSumAmt" , df.format(resultMap.getInt("listSumAmt")));
|
|
|
+ replaceInfo.set("goodsSumAmt" , df.format(resultMap.getInt("goodsSumAmt")));
|
|
|
+ replaceInfo.set("goodsDcSumAmt" , df.format(resultMap.getInt("goodsDcSumAmt")));
|
|
|
+ replaceInfo.set("delvFeeSumAmt" , df.format(resultMap.getInt("delvFeeSumAmt")));
|
|
|
+ replaceInfo.set("realDelvSumAmt" , df.format(resultMap.getInt("realDelvSumAmt")));
|
|
|
+ replaceInfo.set("cpn1DcSumAmt" , df.format(resultMap.getInt("cpn1DcSumAmt")));
|
|
|
+ replaceInfo.set("tmtbSumAmt" , df.format(resultMap.getInt("tmtbSumAmt")));
|
|
|
+ replaceInfo.set("cpnDcSumAmt" , df.format(resultMap.getInt("cpnDcSumAmt")));
|
|
|
+ replaceInfo.set("prePntDcSumAmt" , df.format(resultMap.getInt("prePntDcSumAmt")));
|
|
|
+ replaceInfo.set("pntDcSumAmt" , df.format(resultMap.getInt("pntDcSumAmt")));
|
|
|
+ replaceInfo.set("gfcdUseSumAmt" , df.format(resultMap.getInt("gfcdUseSumAmt")));
|
|
|
+ replaceInfo.set("savePntSumAmt" , df.format(resultMap.getInt("savePntSumAmt")));
|
|
|
+ replaceInfo.set("mileageDcAmt" , df.format(resultMap.getInt("mileageDcAmt")));
|
|
|
+ replaceInfo.set("allianceDcAmt" , df.format(resultMap.getInt("allianceDcAmt")));
|
|
|
+ replaceInfo.set("orderInfo" , resultMap.get("orderInfo"));
|
|
|
+ replaceInfo.set("ordNm" , resultMap.get("ordNm"));
|
|
|
+ replaceInfo.set("ordNo" , resultMap.get("ordNo"));
|
|
|
+ replaceInfo.set("ordDt" , resultMap.get("ordDt"));
|
|
|
+ replaceInfo.set("recipNm" , resultMap.get("recipNm"));
|
|
|
+ replaceInfo.set("recipPhnno" , resultMap.get("recipPhnno"));
|
|
|
+ replaceInfo.set("recipZipcode" , resultMap.get("recipZipcode"));
|
|
|
+ replaceInfo.set("recipBaseAddr" , resultMap.get("recipBaseAddr"));
|
|
|
+ replaceInfo.set("recipDtlAddr" , resultMap.get("recipDtlAddr"));
|
|
|
+ replaceInfo.set("delvMemo" , resultMap.get("delvMemo"));
|
|
|
+ replaceInfo.set("pgGbNm" , resultMap.get("pgGbNm"));
|
|
|
+ replaceInfo.set("orderListInfo" , resultMap.get("orderListInfo"));
|
|
|
+ replaceInfo.set("orderFreegiftInfo" , resultMap.get("orderFreegiftInfo"));
|
|
|
+
|
|
|
// 2021.06.15
|
|
|
// 주문완료 안내 메일 보내기
|
|
|
if (StringUtils.isNotBlank(orderInfo.getOrdEmail())) {
|
|
|
- mailService.sendOrderComplete(resultMap, userNo);
|
|
|
+ mailService.sendOrderComplete(replaceInfo, userNo);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
// TODO Auto-generated catch block
|
tsit14