人员查询充值到账比例和进行卡充值修复

src/main/java/com/usky/dxtop/model/Staff.java

@@ -60,6 +60,14 @@ public class Staff implements Serializable {
     @TableField(exist = false)
     private String deptName;
 
+    @TableField(exist = false)
+    private String identity;
+
+    /**
+     * 到账比例
+     */
+    @TableField(exist = false)
+    private Double proportion;
     private String card;
 
 

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -196,7 +196,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             Optional.ofNullable(order.getTopRadio())
                     .ifPresent(radio -> {
                         double mul = Arith.mul(order.getMoney().doubleValue(), order.getTopRadio());
-                        order.setMoney(BigDecimal.valueOf(Arith.div(mul,100)));
+                        order.setMoney(BigDecimal.valueOf(mul));
                     });
             chargeVo.setAmt(order.getMoney());
             chargeVo.setCard("h");

src/main/resources/mapper/StaffMapper.xml

@@ -19,10 +19,14 @@
         <result column="update_time" property="updateTime" />
     </resultMap>
     <select id="page" resultType="com.usky.dxtop.model.Staff">
-        select s.*,d.name as deptName
+        select s.*,d.name as deptName,tr.identity,tr.proportion
         from staff as s
         left join dept as d
         on s.pid = d.id
+        left join staff_radio as sr
+        on s.id = sr.staff_id
+        left join top_radio as tr
+        on sr.radio_id = tr.id
         <where>
             <if test="startTime !=null and endTime != null">
                 and s.create_time between #{startTime} and #{endTime}