* 功能优化

src/main/java/com/huiju/estateagents/common/CommonUtils.java

@@ -68,6 +68,19 @@ public class CommonUtils {
      */
     public static Double fenToYuan(Integer money) {
         return Double.parseDouble(BigDecimal.valueOf(Long.valueOf(money)).divide(new BigDecimal(100)).toString());
+    }
 
+    /**
+     * double减法运算,防止直接相减失去精度
+     *
+     * @param m1 减数
+     * @param m2 被减数
+     * @return
+     */
+    public static Double subDouble(double m1, double m2) {
+        BigDecimal p1 = new BigDecimal(Double.toString(m1));
+        BigDecimal p2 = new BigDecimal(Double.toString(m2));
+        return p1.subtract(p2).doubleValue();
     }
+
 }

src/main/java/com/huiju/estateagents/excel/redPacket/AccountConsumeRecordExport.java

@@ -42,6 +42,6 @@ public class AccountConsumeRecordExport {
     private String phone;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "消费状态", index = 5)
+    @ExcelProperty(value = "消费状态", index = 6)
     private String consumeStatus;
 }

src/main/java/com/huiju/estateagents/excel/redPacket/RedPacketRankingListExport.java

@@ -13,31 +13,25 @@ import lombok.Data;
 @Data
 public class RedPacketRankingListExport {
 
-
-    @ColumnWidth(15)
-    @ExcelProperty(value = "头像", index = 0)
-    private String avatarurl;
-
-
     @ColumnWidth(15)
-    @ExcelProperty(value = "昵称", index = 1)
+    @ExcelProperty(value = "昵称", index = 0)
     private String nickname;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "姓名", index = 2)
+    @ExcelProperty(value = "姓名", index = 1)
     private String name;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "手机号", index = 3)
+    @ExcelProperty(value = "手机号", index = 2)
     private String phone;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "发起时间", index = 4)
+    @ExcelProperty(value = "发起时间", index = 3)
     private String createDate;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "助力人数", index = 5)
+    @ExcelProperty(value = "助力人数", index = 4)
     private String votes;
 }

src/main/java/com/huiju/estateagents/excel/redPacket/RedPacketVisitRecordtExport.java

@@ -13,35 +13,29 @@ import lombok.Data;
 @Data
 public class RedPacketVisitRecordtExport {
 
-
-    @ColumnWidth(15)
-    @ExcelProperty(value = "头像", index = 0)
-    private String avatarurl;
-
-
     @ColumnWidth(15)
-    @ExcelProperty(value = "昵称", index = 1)
+    @ExcelProperty(value = "昵称", index = 0)
     private String nickname;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "姓名", index = 2)
+    @ExcelProperty(value = "姓名", index = 1)
     private String name;
 
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "手机号", index = 3)
+    @ExcelProperty(value = "手机号", index = 2)
     private String phone;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问时间", index = 4)
+    @ExcelProperty(value = "访问时间", index = 3)
     private String createDate;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "分享人昵称", index = 5)
+    @ExcelProperty(value = "分享人昵称", index = 4)
     private String sharePersonNickName;
 
     @ColumnWidth(15)
-    @ExcelProperty(value = "分享人手机号", index = 6)
+    @ExcelProperty(value = "分享人手机号", index = 5)
     private String sharePersonPhone;
 }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -171,7 +171,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         }
 
         // 计算支付金额
-        Double realAmount = amount * (1 + CommConstant.WXMCH_PAY_RATE);
+        Double realAmount = Math.ceil(amount * (1 + CommConstant.WXMCH_PAY_RATE) * 100) / 100;
 
         // 1.创建订单主表信息
         TaOrgOrder taOrgOrder = new TaOrgOrder();
@@ -215,7 +215,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         JSONObject obj = new JSONObject();
         obj.put("amount", amount);
         obj.put("realAmount", realAmount);
-        obj.put("serviceFee", amount * CommConstant.WXMCH_PAY_RATE);
+        obj.put("serviceFee", CommonUtils.subDouble(realAmount, amount));
         obj.put("mchPayRate", CommConstant.WXMCH_PAY_RATE_STRING);
         obj.put("payQrCode", payResult.getData());
         obj.put("orderInfo", taOrgOrder);

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -258,10 +259,11 @@ public class TaContactController extends BaseController {
 
     /**
      * 新增财务联系人
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/channel/taContactFinance/{id}",method= RequestMethod.PUT)
-    public ResponseBean taContactInfoAdd(@PathVariable Integer id){
+    @RequestMapping(value = "/channel/taContactFinance/{id}", method = RequestMethod.PUT)
+    public ResponseBean taContactInfoAdd(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaContact taContact = new TaContact();
@@ -272,9 +274,9 @@ public class TaContactController extends BaseController {
             } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taContactInfoAdd -=- {}",e.toString());
+            logger.error("taContactInfoAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

src/main/resources/mapper/redpack/TaRedPacketMapper.xml

@@ -151,7 +151,7 @@
 
     <select id = "exportVisitRecordByCondition" resultType="com.huiju.estateagents.excel.redPacket.RedPacketVisitRecordtExport">
         SELECT
-        t.create_date
+        t.create_date,
         t2.nickname,
         t2.NAME,
         t2.avatarurl,

src/main/resources/mapper/redpack/TaRedPacketPersonMapper.xml

@@ -26,7 +26,7 @@
     <select id="exportRedPacketRankingList" resultType="com.huiju.estateagents.excel.redPacket.RedPacketRankingListExport">
         SELECT
             t.votes,
-            t.crate_date,
+            t.create_date,
             t2.phone,
             t2.NAME,
             t2.nickname nickname,