Merge remote-tracking branch 'origin/style' into jsh77b

src/main/java/com/style24/persistence/mybatis/shop/TsaSettle.xml

@@ -164,9 +164,11 @@
 		        LEFT OUTER JOIN TB_EXTMALL E ON OD.EXTMALL_ID = E.EXTMALL_ID
 		        LEFT OUTER JOIN TB_COUPON_BURDEN CB1 ON OD.CPN1_CPN_SQ = CB1.CPN_ID
 		                                            AND OD.SUPPLY_COMP_CD = CB1.SUPPLY_COMP_CD
-		        LEFT OUTER JOIN TB_COUPON_BURDEN CB2 ON OD.GOODS_CPN_SQ = CB2.CPN_ID
+		        LEFT OUTER JOIN TB_CUST_COUPON CC2 ON OD.GOODS_CPN_SQ = CC2.CUST_CPN_SQ
+		        LEFT OUTER JOIN TB_COUPON_BURDEN CB2 ON CC2.CPN_ID = CB2.CPN_ID
 		                                            AND OD.SUPPLY_COMP_CD = CB2.SUPPLY_COMP_CD
-		        LEFT OUTER JOIN TB_COUPON_BURDEN CB3 ON OD.CART_CPN_SQ = CB3.CPN_ID
+		        LEFT OUTER JOIN TB_CUST_COUPON CC3 ON OD.CART_CPN_SQ = CC3.CUST_CPN_SQ
+		        LEFT OUTER JOIN TB_COUPON_BURDEN CB3 ON CC3.CPN_ID = CB3.CPN_ID
 		                                            AND OD.SUPPLY_COMP_CD = CB3.SUPPLY_COMP_CD
 		        LEFT OUTER JOIN TB_TMTB_BURDEN TB1 ON OD.TMTB1_SQ = TB1.TMTB_SQ
 		                                          AND OD.SUPPLY_COMP_CD = TB1.TMTB_SUPPLY_CD
@@ -347,9 +349,11 @@
 		                LEFT OUTER JOIN TB_EXTMALL E ON OD.EXTMALL_ID = E.EXTMALL_ID
 		                LEFT OUTER JOIN TB_COUPON_BURDEN CB1 ON OD.CPN1_CPN_SQ = CB1.CPN_ID
 		                                                    AND OD.SUPPLY_COMP_CD = CB1.SUPPLY_COMP_CD
-		                LEFT OUTER JOIN TB_COUPON_BURDEN CB2 ON OD.GOODS_CPN_SQ = CB2.CPN_ID
+		                LEFT OUTER JOIN TB_CUST_COUPON CC2 ON OD.GOODS_CPN_SQ = CC2.CUST_CPN_SQ
+		                LEFT OUTER JOIN TB_COUPON_BURDEN CB2 ON CC2.CPN_ID = CB2.CPN_ID
 		                                                    AND OD.SUPPLY_COMP_CD = CB2.SUPPLY_COMP_CD
-		                LEFT OUTER JOIN TB_COUPON_BURDEN CB3 ON OD.CART_CPN_SQ = CB3.CPN_ID
+		                LEFT OUTER JOIN TB_CUST_COUPON CC3 ON OD.CART_CPN_SQ = CC3.CUST_CPN_SQ
+		                LEFT OUTER JOIN TB_COUPON_BURDEN CB3 ON CC3.CPN_ID = CB3.CPN_ID
 		                                                    AND OD.SUPPLY_COMP_CD = CB3.SUPPLY_COMP_CD
 		                LEFT OUTER JOIN TB_TMTB_BURDEN TB1 ON OD.TMTB1_SQ = TB1.TMTB_SQ
 		                                                  AND OD.SUPPLY_COMP_CD = TB1.TMTB_SUPPLY_CD