money

conf/script/1000/orderApi/BE_Order_BillConfirm_DYLK.groovy

@@ -18,6 +18,7 @@ import com.dderp.common.entity.order.OrderFinances
 import com.dderp.common.entity.order.OrderStep
 import com.dderp.common.entity.site.ERPTokenUser
 import com.dderp.common.entity.store.StorePlatform
+import com.dderp.common.tool.ERPUtils
 import com.dySweetFishPlugin.elasticsearch.ESClient
 import com.dySweetFishPlugin.sql.TableIdService
 import com.dySweetFishPlugin.sql.dao.TunaService
@@ -121,24 +122,24 @@ class BE_Order_BillConfirm_DYLK implements BusinessExecutor<InvokeCallParams, In
 
         BusinessOrder esOrder = orderResult.result.get(0) //这么查只可能有一个
         //todo 订单金额变化
-        if (invokeOrder["amount_change"]) {
-            esOrder.orderFinances.orderMoney = new BigDecimal(invokeOrder["amount_change"]["sale_price"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.deliverFee = new BigDecimal(invokeOrder["amount_change"]["merchant_deliver_freight_fee"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.storeDiscount = new BigDecimal(invokeOrder["amount_change"]["activities_fee_amount"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.customerRefunded = new BigDecimal(invokeOrder["total_user_refund_amount"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.platformServiceFee = new BigDecimal(invokeOrder["amount_change"]["commission_amount"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.storeRealCollection = new BigDecimal(invokeOrder["amount_change"]["estimated_order_income"] as int / 100).setScale(2, RoundingMode.CEILING)
+        if (invokeOrder["amount_change"] != null) {
+            esOrder.orderFinances.orderMoney = ERPUtils.money(invokeOrder["amount_change"]["sale_price"] as int)
+            esOrder.orderFinances.deliverFee = ERPUtils.money(invokeOrder["amount_change"]["merchant_deliver_freight_fee"] as int)
+            esOrder.orderFinances.storeDiscount = ERPUtils.money(invokeOrder["amount_change"]["activities_fee_amount"] as int)
+            esOrder.orderFinances.customerRefunded = ERPUtils.money(invokeOrder["total_user_refund_amount"] as int)
+            esOrder.orderFinances.platformServiceFee = ERPUtils.money(invokeOrder["amount_change"]["commission_amount"] as int)
+            esOrder.orderFinances.storeRealCollection = ERPUtils.money(invokeOrder["amount_change"]["estimated_order_income"] as int)
         } else {
-            esOrder.orderFinances.orderMoney = new BigDecimal(invokeOrder["order"]["sale_price"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.deliverFee = new BigDecimal(invokeOrder["order"]["merchant_deliver_freight_fee"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.storeDiscount = new BigDecimal(invokeOrder["order"]["activities_fee_amount"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.platformServiceFee = new BigDecimal(invokeOrder["order"]["commission_amount"] as int / 100).setScale(2, RoundingMode.CEILING)
-            esOrder.orderFinances.storeRealCollection = new BigDecimal(invokeOrder["order"]["estimated_order_income"] as int / 100).setScale(2, RoundingMode.CEILING)
+            esOrder.orderFinances.orderMoney = ERPUtils.money(invokeOrder["order"]["sale_price"] as int)
+            esOrder.orderFinances.deliverFee = ERPUtils.money(invokeOrder["order"]["merchant_deliver_freight_fee"] as int)
+            esOrder.orderFinances.storeDiscount = ERPUtils.money(invokeOrder["order"]["activities_fee_amount"] as int)
+            esOrder.orderFinances.platformServiceFee = ERPUtils.money(invokeOrder["order"]["commission_amount"] as int)
+            esOrder.orderFinances.storeRealCollection = ERPUtils.money(invokeOrder["order"]["estimated_order_income"] as int)
         }
         OrderFinances.update(esOrder.orderFinances, currentUser.id)
 
         OrderStep orderStep = orderStepService.parseOrderStep(esOrder.id, "订单账单确认",
-                "商品金额: " + new BigDecimal(invokeOrder["order"]["sale_price"] as int / 100).setScale(2, RoundingMode.CEILING) +
+                "商品金额: " + ERPUtils.money(invokeOrder["order"]["sale_price"] as int) +
                         " 商户预计收入: " + esOrder.orderFinances.storeRealCollection, currentUser)
 
         //持久化

conf/script/1000/orderApi/BE_Order_CreateOrder_DYLK.groovy

@@ -15,6 +15,7 @@ import com.dderp.common.entity.order.*
 import com.dderp.common.entity.site.ERPTokenUser
 import com.dderp.common.entity.store.StoreInfo
 import com.dderp.common.entity.store.StorePlatform
+import com.dderp.common.tool.ERPUtils
 import com.dySweetFishPlugin.elasticsearch.ESClient
 import com.dySweetFishPlugin.sql.TableIdService
 import com.dySweetFishPlugin.sql.dao.TunaService
@@ -112,7 +113,7 @@ class BE_Order_CreateOrder_DYLK implements BusinessExecutor<InvokeCallParams, In
         StoreInfo storeInfo = storeService.getStoreInfo(storePlatform.idStore, supplierCode, false, false, false);
         businessOrder.setIdStore(storeInfo.id)
         businessOrder.setStoreName(storeInfo.storeName)
-        BigDecimal deliverFee = new BigDecimal((invokeOrder["amount_info"]["freight_pay_amount"] as int) / 100).setScale(2, RoundingMode.CEILING)
+        BigDecimal deliverFee = ERPUtils.money((invokeOrder["amount_info"]["freight_pay_amount"] as int))
         businessOrder.setDeliverFee(deliverFee)
         String address = "[" + invokeOrder["receiver_info"]["city"] + "]" + invokeOrder["receiver_info"]["province"] +
                 invokeOrder["receiver_info"]["city"] +
@@ -130,10 +131,10 @@ class BE_Order_CreateOrder_DYLK implements BusinessExecutor<InvokeCallParams, In
         OrderFinances orderFinances = new OrderFinances()
         orderFinances.setId(tableIdService.getTableIdMulti("deBusinessOrder.id", 1, dataSourceId, String.valueOf(supplierCode)))
         orderFinances.setIdOrder(businessOrder.id)
-        orderFinances.setOrderMoney(new BigDecimal((invokeOrder["amount_info"]["origin_amount"] as int) / 100).setScale(2, RoundingMode.CEILING))
+        orderFinances.setOrderMoney(ERPUtils.money(invokeOrder["amount_info"]["origin_amount"] as int))
         orderFinances.setDeliverFee(deliverFee)
-        orderFinances.setCustomerPaid(new BigDecimal((invokeOrder["amount_info"]["pay_amount"] as int) / 100).setScale(2, RoundingMode.CEILING))
-        orderFinances.setStoreRealCollection(new BigDecimal((invokeOrder["amount_info"]["estimated_order_income"] as int) / 100).setScale(2, RoundingMode.CEILING))
+        orderFinances.setCustomerPaid(ERPUtils.money(invokeOrder["amount_info"]["pay_amount"] as int))
+        orderFinances.setStoreRealCollection(ERPUtils.money(invokeOrder["amount_info"]["estimated_order_income"] as int))
 
         businessOrder.setOrderFinances(orderFinances)
 

conf/script/1000/orderApi/BE_Order_DeliveryChange_DYLK.groovy

@@ -179,7 +179,7 @@ class BE_Order_DeliveryChange_DYLK implements BusinessExecutor<InvokeCallParams,
             orderDeliveryInfo.setBookingDeliverTime(new Date(orderDeliveryInfo.bookingDeliverTimeLong))
             orderDeliveryInfo.setCustomerMemo(dyOrder["order"]["remark"] as String)
 
-            BigDecimal deliverFee = new BigDecimal((dyOrder["amount_info"]["freight_pay_amount"] as int) / 100).setScale(2, RoundingMode.CEILING)
+            BigDecimal deliverFee = com.dderp.common.tool.ERPUtils((dyOrder["amount_info"]["freight_pay_amount"] as int) / 100).setScale(2, RoundingMode.CEILING)
             esOrder.setDeliverFee(deliverFee)
 
             esOrder.setDeliverAddressAll(address)

conf/script/1000/orderApi/BE_Order_PartRefund_DYLK.groovy

@@ -152,17 +152,17 @@ class BE_Order_PartRefund_DYLK implements BusinessExecutor<InvokeCallParams, Inv
         OrderAfterSaleBill.create(afterSaleBill, currentUser.id)
 
         //todo 订单金额变化
-        esOrder.orderFinances.orderMoney = new BigDecimal(invokeOrder["amount_change"]["sale_price"] as int / 100).setScale(2, RoundingMode.CEILING)
-        esOrder.orderFinances.deliverFee = new BigDecimal(invokeOrder["amount_change"]["merchant_deliver_freight_fee"] as int / 100).setScale(2, RoundingMode.CEILING)
-        esOrder.orderFinances.storeDiscount = new BigDecimal(invokeOrder["amount_change"]["activities_fee_amount"] as int / 100).setScale(2, RoundingMode.CEILING)
-        esOrder.orderFinances.customerRefunded = new BigDecimal(invokeOrder["total_user_refund_amount"] as int / 100).setScale(2, RoundingMode.CEILING)
-        esOrder.orderFinances.platformServiceFee = new BigDecimal(invokeOrder["amount_change"]["commission_amount"] as int / 100).setScale(2, RoundingMode.CEILING)
-        esOrder.orderFinances.storeRealCollection = new BigDecimal(invokeOrder["amount_change"]["estimated_order_income"] as int / 100).setScale(2, RoundingMode.CEILING)
+        esOrder.orderFinances.orderMoney = ERPUtils.money(invokeOrder["amount_change"]["sale_price"] as int)
+        esOrder.orderFinances.deliverFee = ERPUtils.money(invokeOrder["amount_change"]["merchant_deliver_freight_fee"] as int)
+        esOrder.orderFinances.storeDiscount = ERPUtils.money(invokeOrder["amount_change"]["activities_fee_amount"] as int)
+        esOrder.orderFinances.customerRefunded = ERPUtils.money(invokeOrder["total_user_refund_amount"] as int)
+        esOrder.orderFinances.platformServiceFee = ERPUtils.money(invokeOrder["amount_change"]["commission_amount"] as int)
+        esOrder.orderFinances.storeRealCollection = ERPUtils.money(invokeOrder["amount_change"]["estimated_order_income"] as int)
 
         OrderFinances.update(esOrder.orderFinances, currentUser.id)
 
         OrderStep orderStep = orderStepService.parseOrderStep(esOrder.id, "订单已部分退款,原因:" + refundReasonMsg,
-                "退款金额: " + new BigDecimal(invokeOrder["user_refund_amount"] as int / 100).setScale(2, RoundingMode.CEILING) +
+                "退款金额: " + ERPUtils.money(invokeOrder["user_refund_amount"] as int) +
                         " 商户预计收入: " + esOrder.orderFinances.storeRealCollection, currentUser)
 
         //持久化