Skip to content

D
data-server
Commit 5c8ee6ca authored by codezwjava's avatar codezwjava
Browse files
Options

日度定时升级后培育奖金额累加到账户表中

parent 08875cde
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 2 deletions
wisenergy-service/src/main/java/cn/wisenergy/service/app/OrderService.java
View file @ 5c8ee6ca
......@@ -7,6 +7,8 @@ import cn.wisenergy.model.dto.OrderInfoQuery;
import com.github.pagehelper.PageInfo;
import com.youzan.cloud.open.sdk.common.exception.SDKException;
import java.io.IOException;
/**
*@ Description: 订单接口定义
*@ Author : 86187
......@@ -32,4 +34,10 @@ public interface OrderService {
* @return
*/
R<PageInfo<OrderInfo>> findByPage(OrderInfoQuery query);
/**
* 测试用户直推表中的当月收益字段是否累加
* @throws IOException
*/
// void orderJSON() throws IOException;
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/OrderServiceImpl.java
View file @ 5c8ee6ca
package cn.wisenergy.service.app.impl;
import cn.hutool.json.JSONUtil;
import cn.wisenergy.common.constant.CommonAttributes;
import cn.wisenergy.common.utils.R;
import cn.wisenergy.mapper.OrderMapper;
......@@ -7,11 +8,12 @@ import cn.wisenergy.mapper.RecommendUserMapper;
import cn.wisenergy.mapper.UsersMapper;
import cn.wisenergy.model.app.OrderInfo;
import cn.wisenergy.model.app.RecommendUser;
import cn.wisenergy.model.dto.AccountInfoQuery;
import cn.wisenergy.model.dto.OrderInfoQuery;
import cn.wisenergy.service.app.OrderService;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Ordering;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.youzan.cloud.open.sdk.common.exception.SDKException;
import com.youzan.cloud.open.sdk.core.client.auth.Token;
......@@ -21,11 +23,11 @@ import com.youzan.cloud.open.sdk.core.oauth.token.TokenParameter;
import com.youzan.cloud.open.sdk.gen.v4_0_0.model.YouzanTradesSoldGetResult;
import com.youzan.cloud.open.sdk.gen.v4_0_1.api.YouzanTradesSoldGet;
import com.youzan.cloud.open.sdk.gen.v4_0_1.model.YouzanTradesSoldGetParams;
import javafx.scene.input.DataFormat;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.*;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
......@@ -311,5 +313,114 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
schemeVo.setPageSize(pageSize);
}
// //获取本地json文件进行测试
// @Override
// public void orderJSON() {
//
// String path = "G:\\workmms\\shop-mall\\wisenergy-web-admin\\src\\main\\resources\\templates\\orderJson.json";
//// String path = JSONUtil.class.getClassLoader().getResource("G:\\workmms\\shop-mall\\wisenergy-web-admin\\src\\main\\resources\\templates\\orderJson.json").getPath();
// String orderJSON = readJsonFile(path);
//
// YouzanTradesSoldGetResult youzanTradesSoldGetResult = JSON.parseObject(orderJSON, YouzanTradesSoldGetResult.class);
// List<YouzanTradesSoldGetResult.YouzanTradesSoldGetResultFullorderinfolist> fullOrderInfoList = youzanTradesSoldGetResult.getData().getFullOrderInfoList();
//
// OrderInfo orderInfo = new OrderInfo();
// for (YouzanTradesSoldGetResult.YouzanTradesSoldGetResultFullorderinfolist youzanTradesSoldGetResultFullorderinfolist : fullOrderInfoList) {
//
// YouzanTradesSoldGetResult.YouzanTradesSoldGetResultBuyerinfo buyerInfo = youzanTradesSoldGetResultFullorderinfolist.getFullOrderInfo().getBuyerInfo();
// List<YouzanTradesSoldGetResult.YouzanTradesSoldGetResultOrders> orders = youzanTradesSoldGetResultFullorderinfolist.getFullOrderInfo().getOrders();
// YouzanTradesSoldGetResult.YouzanTradesSoldGetResultOrderinfo youzanOrderInfo = youzanTradesSoldGetResultFullorderinfolist.getFullOrderInfo().getOrderInfo();
// YouzanTradesSoldGetResult.YouzanTradesSoldGetResultPayinfo payInfo = youzanTradesSoldGetResultFullorderinfolist.getFullOrderInfo().getPayInfo();
//
// //item_id 字段 处理
// List<String> itemList = new ArrayList<>();
// for (YouzanTradesSoldGetResult.YouzanTradesSoldGetResultOrders order : orders) {
// String itemId = order.getItemId().toString();
// itemList.add(itemId);
// }
//
// orderInfo.setItemId(itemList.toString());
// //有赞的outer_user_id 与有赞的对应关系是邀请码 邀请码唯一
// String outerUserId = buyerInfo.getOuterUserId();
// log.info("有赞返回OutUserId------------" + outerUserId);
// String userId = usersMapper.getUserIdByIntiveCode(outerUserId);
// log.info("对应西田森系统中的用户Id--------" + userId);
// orderInfo.setUserId(userId);
// //支付方式
// orderInfo.setPayType(youzanOrderInfo.getPayType().toString());
// //有赞update_time
// orderInfo.setYouzanUpdateTime(youzanOrderInfo.getUpdateTime());
// //tid
// orderInfo.setTid(youzanOrderInfo.getTid());
// //created 订单创建时间
// orderInfo.setCreated(youzanOrderInfo.getCreated());
// //team_type 店铺类型
// orderInfo.setTeamType(youzanOrderInfo.getTeamType());
// //pay_time
// orderInfo.setPayTime(youzanOrderInfo.getPayTime());
// //pay_type_str 支付渠道
// orderInfo.setPayTypeStr(youzanOrderInfo.getPayTypeStr());
// //close_type
// orderInfo.setCloseType(youzanOrderInfo.getCloseType().intValue());
// //refund_state 退款状态
// orderInfo.setRefundState(youzanOrderInfo.getRefundState());
// //success_time
// orderInfo.setSuccessTime(youzanOrderInfo.getSuccessTime());
// //payment
// orderInfo.setPayment(new BigDecimal(payInfo.getPayment()));
// //当前订单所对应的用户直推表当月消费 累计消费字段累加
// RecommendUser recommendUserMapperByUserId = recommendUserMapper.getByUserId(userId);
// if (null != recommendUserMapperByUserId){
// //历史消费
// BigDecimal historyCount = recommendUserMapperByUserId.getHistoryCount();
//
// //当月消费
// BigDecimal monthyCount = recommendUserMapperByUserId.getMonthyCount();
//
// recommendUserMapperByUserId.setHistoryCount(historyCount.add(new BigDecimal(payInfo.getPayment())));
// recommendUserMapperByUserId.setMonthyCount(monthyCount.add(new BigDecimal(payInfo.getPayment())));
//
// recommendUserMapper.updateById(recommendUserMapperByUserId);
// }
// //rebate_status 返佣状态
// orderInfo.setRebateStatus(0);
// //level_status 升级状态
// orderInfo.setLevelStatus(0);
// //month_order_status //当月订单处理状态
// orderInfo.setMonthOrderStatus(0);
// //monthly_task_status //月度任务处理状态
// orderInfo.setMonthlyTaskStatus(0);
// log.info("根据创建时间获取有赞订单号：" + youzanOrderInfo.getTid());
// orderMapper.insertYouZanOrders(orderInfo);
// }
// }
//
//
// /**
// * 读取json文件，返回json串
// * @param fileName
// * @return
// */
// public static String readJsonFile(String fileName) {
// String jsonStr = "";
// try {
// File jsonFile = new File(fileName);
// FileReader fileReader = new FileReader(jsonFile);
//
// Reader reader = new InputStreamReader(new FileInputStream(jsonFile),"utf-8");
// int ch = 0;
// StringBuffer sb = new StringBuffer();
// while ((ch = reader.read()) != -1) {
// sb.append((char) ch);
// }
// fileReader.close();
// reader.close();
// jsonStr = sb.toString();
// return jsonStr;
// } catch (IOException e) {
// e.printStackTrace();
// return null;
// }
// }
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
View file @ 5c8ee6ca
......@@ -662,6 +662,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
seedling = 1;
cultivatingPrizeInfo.setSeedling(seedling);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+seedling);
} else {
//3.修改培育奖记录状态 ==2
......@@ -698,6 +700,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
bronzeTree = 1;
cultivatingPrizeInfo.setBronzeTree(bronzeTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+bronzeTree);
} else {
//3.修改培育奖记录状态 ==2
......@@ -734,6 +738,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
silverTree = 1;
cultivatingPrizeInfo.setBronzeTree(silverTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+silverTree);
} else {
//3.修改培育奖记录状态 ==2
......@@ -769,6 +775,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
goldTree = 1;
cultivatingPrizeInfo.setGoldTree(goldTree);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+goldTree);
}else {
//3.修改培育奖记录状态 ==2
......@@ -804,6 +812,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
farmer = 1;
cultivatingPrizeInfo.setGoldTree(farmer);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+farmer);
}else {
//3.修改培育奖记录状态 ==2
......@@ -839,6 +849,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
forestStart = 1;
cultivatingPrizeInfo.setGoldTree(forestStart);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+forestStart);
}else {
//3.修改培育奖记录状态 ==2
......@@ -874,6 +886,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
partner = 1;
cultivatingPrizeInfo.setGoldTree(partner);
cultivatingPrizeInfoMapper.updateById(cultivatingPrizeInfo);
//账户表中累计收益和当月收益累加
accountAddEarningsTotalAndEarningsMonth(inviteUserId,cultivatingPrize);
log.info("用户:"+inviteUserId +"获得"+ "培育奖来自---用户id:"+userId+"userlevel:"+level+"status:"+partner);
}else {
//3.修改培育奖记录状态 ==2
......@@ -907,5 +921,21 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
teamPerformanceMapper.edit(teamPerformanceByUserId);
}
}
/**
* 用户获得培育奖之后
* 进行账户表累加操作
* 当月收益和累计收益
* @param userId
*/
public void accountAddEarningsTotalAndEarningsMonth(String userId , BigDecimal cultivatingPrize){
AccountInfo accountMapperByUserId = accountMapper.getByUserId(userId);
BigDecimal earningsMonth = accountMapperByUserId.getEarningsMonth();
BigDecimal earningsTotal = accountMapperByUserId.getEarningsTotal();
accountMapperByUserId.setEarningsMonth(earningsMonth.add(cultivatingPrize));
accountMapperByUserId.setEarningsTotal(earningsTotal.add(cultivatingPrize));
accountMapper.edit(accountMapperByUserId);
}
}
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLevelController.java
View file @ 5c8ee6ca
......@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
@Api(tags = "用户等级管理")
@RestController
@RequestMapping("/user")
......@@ -123,4 +125,11 @@ public class UserLevelController {
public void clearMonthCount(){
recommendUserService.clearMonthCount();
}
@ApiOperation(value = "订单测试用户直推的当月收益累加", notes = "订单测试用户直推的当月收益累加", httpMethod = "GET")
@GetMapping("/jsonOrder")
public void jsonOrder() throws IOException {
orderService.orderJSON();
}
}
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