czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

后台主页逻辑加规则，账单详情改变接口传参方式，vip同步小程序，后台营业执照日期格式，银盛回调暂时在测试服上

Browse Source
This commit is contained in:
liuyingfang
2023-04-25 16:36:31 +08:00
parent 69eea7ab5f
commit b5174dce3d
8 changed files with 66 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pluss-manage-page/src/main/java/cn/pluss/platform/controller/home/HomeController.java
View File

@@ -77,11 +77,24 @@ public class HomeController extends BaseNoModelController {
BigDecimal yestDayNowTransAmt = merchantOrderService.getPlatformAmtYestNowData(date,yestStartDate,yestEndDate);
BigDecimal toDayTransCount = orderData.get("toDayTransCount") == null ? BigDecimal.ZERO :BigDecimal.valueOf((double)orderData.get("toDayTransCount"));
BigDecimal subtract = toDayTransCount.subtract(yestDayNowTransAmt);
BigDecimal scale = subtract.divide(yestDayNowTransAmt,4,BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_DOWN);
BigDecimal scale;
if((BigDecimal.ZERO).compareTo(yestDayNowTransAmt) == 0){
scale = new BigDecimal("0.00");
}else {
scale = subtract.divide(yestDayNowTransAmt,4,BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_DOWN);
}
result.putAll(orderData);
result.putAll(refundData);
result.putAll(otherData);
result.putAll(amtData);
if(amtData == null){
HashMap<String, Object> amtDataMap = new HashMap<>(16);
amtDataMap.put("toDayProfitCount", "0.00");
amtDataMap.put("toDayShareCount", "0.00");
amtDataMap.put("toDayFansCount", "0.00");
result.putAll(amtDataMap);
} else {
result.putAll(amtData);
}
result.putAll(transData);
PlatformData yesterDayData = platformDataService.censusPlatformData();
result.put("yesterDay",yesterDayData);
@@ -121,6 +134,14 @@ public class HomeController extends BaseNoModelController {
return ResultGenerator.genSuccessResult("获取成功",result);
}
public static void main(String[] args) {
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("toDayProfitCount", "0.00");
objectObjectHashMap.put("toDayShareCount", "0.00");
objectObjectHashMap.put("toDayFansCount", "0.00");
System.out.println(objectObjectHashMap);
}
@PostMapping("/logout")
@ResponseBody
public Map<String, Object> login(HttpServletRequest request) {

7
pluss-manage-page/src/main/java/cn/pluss/platform/controller/merchantStore/MerchantStoreController.java
View File

@@ -4,6 +4,7 @@ import cn.pluss.platform.annotation.PassToken;
import cn.pluss.platform.api.Result;
import cn.pluss.platform.api.ResultGenerator;
import cn.pluss.platform.channel.MerchantAuditService;
import cn.pluss.platform.channel.ys.YSAuditServiceV3;
import cn.pluss.platform.common.CommonRemarkService;
import cn.pluss.platform.controller.BaseNoModelController;
import cn.pluss.platform.entitiy.ShiroUser;
@@ -85,6 +86,8 @@ public class MerchantStoreController extends BaseNoModelController {
@Setter(onMethod_ = {@Autowired, @Qualifier("ysAuditServiceV2")})
private MerchantAuditService ysAuditServiceV2;
@Resource
private YSAuditServiceV3 ysAuditServiceV3;
/**
@@ -462,8 +465,8 @@ public class MerchantStoreController extends BaseNoModelController {
try {
JSONObject params = new JSONObject();
params.put("userId", ua.getUserId() + "");
ysAuditServiceV2.merchantAudit(ua.getUserId() + "", false);
// userAppService.merchantAudit(params, "4");
//ysAuditServiceV2.merchantAudit(ua.getUserId() + "", false);
ysAuditServiceV3.merchantAuditV3(String.valueOf(ua.getUserId()), false); // userAppService.merchantAudit(params, "4");
result.put("code", "1");
result.put("msg", "发起进件成功, 稍后查看进件状态");
return result;