Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -222,7 +222,7 @@ public class PayOrderLogic {
 
         if (workerOrderBuy.getServicePrice() != null){
 
-            totalAmount.add(workerOrderBuy.getServicePrice());
+            totalAmount = totalAmount.add(workerOrderBuy.getServicePrice());
 
             BigDecimal workerServiceProceAmount = workerOrderBuy.getServicePrice().multiply(Convert.toBigDecimal("0.006"));
 
@@ -238,7 +238,7 @@ public class PayOrderLogic {
 
         if (workerOrderBuy.getOtherPrice() != null){
 
-            totalAmount.add(workerOrderBuy.getOtherPrice());
+            totalAmount = totalAmount.add(workerOrderBuy.getOtherPrice());
             BigDecimal workerOtherProceAmount = workerOrderBuy.getOtherPrice().multiply(Convert.toBigDecimal("0.006"));