Quellcode durchsuchen

fix:“导出增加机主分销金额"

soobin vor 4 Monaten
Ursprung
Commit
f4f8f733e0

+ 3 - 0
src/main/java/com/szwl/controller/TCoinOrderController.java

@@ -112,6 +112,9 @@ public class TCoinOrderController {
             }
             return JsonMessage.success("添加线下订单成功");
         }
+        if (StringUtils.isEmpty(clientId)) {
+            return JsonMessage.error("设备编号不能为空");
+        }
         TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(clientId));
         String machineType = equipment.getMachineType(); // 设备类型
 

+ 3 - 0
src/main/java/com/szwl/model/excel/NewOrderTarget.java

@@ -56,6 +56,9 @@ public class NewOrderTarget {
     @ExcelProperty("支付方式")
     private String frp_code;
 
+    @ExcelProperty("机主分销金额")
+    private String adminProportion;
+
     @ExcelProperty("一级分账金额")
     private String agencyProportion;
 

+ 4 - 0
src/main/java/com/szwl/service/impl/TOrderServiceImpl.java

@@ -379,6 +379,10 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
                 }
 
                 BigDecimal price = order.getPrice();
+                if (order.getAdminProportion() != null) {
+                    BigDecimal adminAmount = price.multiply(order.getAdminProportion().divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_DOWN);
+                    orderTarget.setAdminProportion(adminAmount.toString());
+                }
                 if (order.getAgencyProportion() != null) {
 
                     BigDecimal selfAmount = price.multiply(order.getAgencyProportion().divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_DOWN);