Skip to content

G
gic-data-cloud
Commit 041da8bf by 陶光胜
Options

Merge branch 'developer' into 'master' 

线上权限调整

See merge request !46
parents f2645b1d dfb2b29e
Showing with 3 additions and 3 deletions
gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/IndexController.java
...@@ -97,9 +97,9 @@ public class IndexController { ...@@ -97,9 +97,9 @@ public class IndexController {
if(response1.isSuccess() && response1.getResult() != null && response2.getResult() != null){ if(response1.isSuccess() && response1.getResult() != null && response2.getResult() != null){
IndexMemberOrderCntDTO indexMemberOrderCntDTO1 = response1.getResult(); IndexMemberOrderCntDTO indexMemberOrderCntDTO1 = response1.getResult();
IndexMemberOrderCntDTO indexMemberOrderCntDTO2 = response2.getResult(); IndexMemberOrderCntDTO indexMemberOrderCntDTO2 = response2.getResult();
consume.setMemberRate(DataFormatUtils.rate(indexMemberOrderCntDTO1.getOrderCnt(), indexMemberOrderCntDTO2.getOrderCnt())); consume.setMemberRate(DataFormatUtils.rate(indexMemberOrderCntDTO2.getOrderCnt(), indexMemberOrderCntDTO1.getOrderCnt()));
String divide = DataFormatUtils.divide(DataFormatUtils.divideDouble(indexMemberOrderCntDTO1.getOrderCnt(), indexMemberOrderCntDTO1.getOrderCntHb()), String divide = DataFormatUtils.divide(DataFormatUtils.divideDouble(indexMemberOrderCntDTO2.getOrderCnt(), indexMemberOrderCntDTO1.getOrderCntHb()),
DataFormatUtils.divideDouble(indexMemberOrderCntDTO2.getOrderCnt(), indexMemberOrderCntDTO2.getOrderCntHb())); DataFormatUtils.divideDouble(indexMemberOrderCntDTO2.getOrderCnt(), indexMemberOrderCntDTO1.getOrderCntHb()));
consume.setMemberHb(divide); consume.setMemberHb(divide);
} }
if(oldOrderCnt.isSuccess() && oldOrderCnt.getResult() != null){ if(oldOrderCnt.isSuccess() && oldOrderCnt.getResult() != null){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment