V1.5

README.md

@@ -59,6 +59,16 @@ V免签为完全开源项目，开源项目意味着作者没有任何收入来
            
 ## 更新记录
 
+  + v1.5（2019.04.20）
+     + 整理代码，重新优化APP兼容性
+     + 添加店员到账支持，添加后可以实现安卓备用机/模拟器 挂小号取收款通知，方便IOS用户，
+        + 微信绑定店员方式=>微信->收付款->二维码收款->收款小账本->添加店员接收通知
+        + 支付宝绑定店员方式=>我的->商家服务->店员通->立即添加
+     + 修复金额无法递减
+     + 修复后台首页的 今日收入 总收入 总是0不计数问题
+     + 修复其他已知bug，建议更新到此版本
+
+
  + v1.4（2019.02.26） 
    + 增加订单删除功能
    + 增加一键删除过期订单功能

src/main/java/com/vone/mq/controller/AdminController.java

@@ -106,11 +106,11 @@ public List<Map<String,Object>> getMenu(HttpSession session){
         return menu;
     }
     @RequestMapping("/admin/saveSetting")
-    public CommonRes saveSetting(HttpSession session,String user,String pass,String notifyUrl,String returnUrl,String key,String wxpay,String zfbpay,String close){
+    public CommonRes saveSetting(HttpSession session,String user,String pass,String notifyUrl,String returnUrl,String key,String wxpay,String zfbpay,String close,String payQf){
         if (session.getAttribute("login")==null){
             return ResUtil.error("未登录");
         }
-        return adminService.saveSetting(user, pass, notifyUrl, returnUrl, key, wxpay, zfbpay, close);
+        return adminService.saveSetting(user, pass, notifyUrl, returnUrl, key, wxpay, zfbpay, close, payQf);
     }
     @RequestMapping("/admin/getSettings")
     public CommonRes getSettings(HttpSession session){

src/main/java/com/vone/mq/service/AdminService.java

@@ -53,7 +53,7 @@ public CommonRes login(String user,String pass){
 
         return ResUtil.success();
     }
-    public CommonRes saveSetting(String user,String pass,String notifyUrl,String returnUrl,String key,String wxpay,String zfbpay,String close){
+    public CommonRes saveSetting(String user,String pass,String notifyUrl,String returnUrl,String key,String wxpay,String zfbpay,String close,String payQf){
         Setting s = new Setting();
         s.setVkey("user");
         s.setVvalue(user);
@@ -82,6 +82,10 @@ public CommonRes saveSetting(String user,String pass,String notifyUrl,String ret
         s.setVvalue(zfbpay);
         settingDao.save(s);
 
+        s.setVkey("payQf");
+        s.setVvalue(payQf);
+        settingDao.save(s);
+
         s.setVkey("close");
         s.setVvalue(close);
         settingDao.save(s);
@@ -197,9 +201,12 @@ public CommonRes getMain(){
         double todayMoney2;
         try {
             todayMoney = payOrderDao.getTodayCountMoney(startDate,endDate,1);
-            todayMoney2 = payOrderDao.getTodayCountMoney(startDate,endDate,2);
         }catch (Exception e){
             todayMoney = 0;
+        }
+        try {
+            todayMoney2 = payOrderDao.getTodayCountMoney(startDate,endDate,2);
+        }catch (Exception e){
             todayMoney2 = 0;
         }
 
@@ -210,9 +217,12 @@ public CommonRes getMain(){
         double countMoney2;
         try {
             countMoney = payOrderDao.getCountMoney(1);
-            countMoney2 = payOrderDao.getCountMoney(2);
         }catch (Exception e){
             countMoney = 0;
+        }
+        try {
+            countMoney2 = payOrderDao.getCountMoney(2);
+        }catch (Exception e){
             countMoney2 = 0;
         }
         countMoney = Arith.add(countMoney,countMoney2);

src/main/java/com/vone/mq/service/QuartzService.java

@@ -22,7 +22,7 @@ public class QuartzService {
     private TmpPriceDao tmpPriceDao;
 
 
-    @Scheduled(fixedRate = 60000)
+    @Scheduled(fixedRate = 30000)
     public void timerToZZP(){
 
         try {

src/main/java/com/vone/mq/service/WebService.java

@@ -62,6 +62,7 @@ public CommonRes createOrder(String payId, String param, Integer type, String pr
 
             if (row == 0){
                 if (payQf==1){
+
                     reallyPrice = Arith.add(reallyPrice,0.01);
                 }else{
                     reallyPrice = Arith.sub(reallyPrice,0.01);

src/main/resources/application.properties

@@ -11,9 +11,9 @@ spring.jpa.show-sql=true
 
 
 #h2数据库控制台设置
-spring.h2.console.settings.web-allow-others=false
+spring.h2.console.settings.web-allow-others=true
 spring.h2.console.path=/h2-console
-spring.h2.console.enabled=false
+spring.h2.console.enabled=true
 
 
 spring.servlet.multipart.max-file-size=100MB