msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
master
Tayl0r 7 years ago
parent 354b6b6595 1c538488b9
commit 000ba24c1b
9 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
Unescape View File

@ -62,7 +62,7 @@ public interface RetailAppService {
JSONObject getClientCurrentRateNew(JSONObject device);
JSONObject listDailyTransactions(String dateStr, String timezone, JSONObject device);
JSONObject listDailyTransactions(String dateStr, String timezone, boolean thisDevOnly, JSONObject device);
JSONObject getActivities(JSONObject device, String activity_page, int page, int limit);

4
src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
Unescape View File

@ -952,7 +952,7 @@ public class RetailAppServiceImp implements RetailAppService {
}
@Override
public JSONObject listDailyTransactions(String dateStr, String timezone, JSONObject device) {
public JSONObject listDailyTransactions(String dateStr, String timezone, boolean thisDevOnly, JSONObject device) {
try {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
dateFormat.setTimeZone(TimeZone.getTimeZone(timezone));
@ -960,7 +960,7 @@ public class RetailAppServiceImp implements RetailAppService {
String clientType = device.getString("client_type");
DeviceRegister register = deviceSupport.findRegister(clientType);
String devId = null;
if (register.includeDevId()) {
if (register.includeDevId() || thisDevOnly) {
devId = device.getString("dev_id");
}
Date to = DateUtils.addDays(date, 1);

18
src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
Unescape View File

@ -116,7 +116,7 @@ public class RetailAppController {
@RequestMapping(value = "/notice/{noticeId}", method = RequestMethod.PUT)
public void updateNoticePartnerHasRead(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, @PathVariable String noticeId, @RequestBody JSONObject account_param) {
if (!device.getString("account_id").equals(account_param.getString("account_id"))){
if (!device.getString("account_id").equals(account_param.getString("account_id"))) {
throw new ForbiddenException("You have no permission");
}
retailAppService.updateReadStatus(device, noticeId);
@ -200,8 +200,9 @@ public class RetailAppController {
@RequestMapping(value = "/daily_transactions/date/{dateStr}", method = RequestMethod.GET)
public JSONObject listDailyTransactions(@PathVariable String dateStr, @RequestParam(defaultValue = "Australia/Melbourne") String timezone,
@RequestParam(defaultValue = "false") boolean thisdevice,
@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
return retailAppService.listDailyTransactions(dateStr, timezone, device);
return retailAppService.listDailyTransactions(dateStr, timezone, thisdevice, device);
}
@RequestMapping(value = "/modify/retail_surcharge", method = RequestMethod.PUT)
@ -250,11 +251,11 @@ public class RetailAppController {
}
@RequestMapping(value = "/cash_back/clean_info", method = RequestMethod.GET)
public JSONObject getCashbackCleanInfo(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device,@RequestParam(value = "client_id",required = false) String client_id) {
if (client_id==null){
client_id=device.getString("client_id");
public JSONObject getCashbackCleanInfo(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device, @RequestParam(value = "client_id", required = false) String client_id) {
if (client_id == null) {
client_id = device.getString("client_id");
}
return retailAppService.getCashbackCleanInfo(device,client_id);
return retailAppService.getCashbackCleanInfo(device, client_id);
}
@RequestMapping(value = "/partner_signin_app_qrcode/{codeId}", method = RequestMethod.GET)
@ -289,9 +290,10 @@ public class RetailAppController {
public JSONObject getAd(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
return retailAppService.getAd(device);
}
@RequestMapping(value = "/ads/{article_id}", method = RequestMethod.GET)
public JSONObject getAdDetail(@PathVariable String article_id,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
return retailAppService.getAdDetail(device,article_id);
public JSONObject getAdDetail(@PathVariable String article_id, @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject device) {
return retailAppService.getAdDetail(device, article_id);
}

4
src/main/java/au/com/royalpay/payment/manage/bdprize/core/BDPrizeService.java
Unescape View File

@ -21,7 +21,7 @@ public interface BDPrizeService {
JSONObject findReport(String month) throws Exception;
JSONObject getBDReport(String month, int managerId);
JSONObject getBDReport(String month, String managerId);
List<JSONObject> getRateConfig();
@ -29,7 +29,7 @@ public interface BDPrizeService {
List<JSONObject> listBDLevels();
void updateBDLevel(int bdId, JSONObject info, JSONObject manager);
void updateBDLevel(String bdId, JSONObject info, JSONObject manager);
List<JSONObject> listBDLeaderAndManager(String month);

24
src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
Unescape View File

@ -246,7 +246,7 @@ public class BDPrizeServiceImpl implements BDPrizeService {
}
@Override
public JSONObject getBDReport(String month, int managerId) {
public JSONObject getBDReport(String month, String managerId) {
try {
Date mon = DateUtils.parseDate(month, new String[]{"yyyy-MM"});
month = DateFormatUtils.format(mon, "yyyy-MM");
@ -281,16 +281,17 @@ public class BDPrizeServiceImpl implements BDPrizeService {
JSONObject totalDetail = financialBDPrizeLogMapper.findByReportAndBDTotal(report.getString("record_id"), managerId);
log.putAll(totalDetail);
if (ManagerRole.BD_LEADER.hasRole(managerId)) {
JSONObject groupPrizeLog = financialBDPrizeLogMapper.findByReportAndGroup(report.getString("record_id"), managerId);
log.put("group_prize", groupPrizeLog);
}
JSONObject bdInfo = managerMapper.findById(String.valueOf(managerId));
JSONObject bdInfo = managerMapper.findById(managerId);
if (bdInfo == null) {
log.put("leftCompany", true);
}else {
if (ManagerRole.BD_LEADER.hasRole(bdInfo.getIntValue("role"))) {
JSONObject groupPrizeLog = financialBDPrizeLogMapper.findByReportAndGroup(report.getString("record_id"), managerId);
log.put("group_prize", groupPrizeLog);
}
}
return log;
}
@ -323,11 +324,10 @@ public class BDPrizeServiceImpl implements BDPrizeService {
}
@Override
public void updateBDLevel(int bdId, JSONObject info, JSONObject manager) {
String bdIdStr = String.valueOf(bdId);
JSONObject config = financialBDConfigMapper.getBdConfig(bdIdStr);
public void updateBDLevel(String bdId, JSONObject info, JSONObject manager) {
JSONObject config = financialBDConfigMapper.getBdConfig(bdId);
if (config == null) {
JSONObject bdUser = managerMapper.findById(bdIdStr);
JSONObject bdUser = managerMapper.findById(bdId);
if (bdUser == null || !ManagerRole.BD_USER.hasRole(bdUser.getIntValue("role"))) {
throw new BadRequestException("BD User Not exists");
}

6
src/main/java/au/com/royalpay/payment/manage/bdprize/web/BDPrizeController.java
Unescape View File

@ -45,13 +45,13 @@ public class BDPrizeController {
}
@ManagerMapping(value = "/records/{month}/bd_users/{managerId}", method = RequestMethod.GET, role = ManagerRole.FINANCIAL_STAFF)
public JSONObject getBDUserReportDetail(@PathVariable String month, @PathVariable int managerId) {
public JSONObject getBDUserReportDetail(@PathVariable String month, @PathVariable String managerId) {
return bdPrizeService.getBDReport(month, managerId);
}
@ManagerMapping(value = "/records/{month}/bd_user_detail", method = RequestMethod.GET, role = ManagerRole.BD_USER)
public JSONObject getBDUserReportDetailForBD(@PathVariable String month, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
return bdPrizeService.getBDReport(month, manager.getIntValue("manager_id"));
return bdPrizeService.getBDReport(month, manager.getString("manager_id"));
}
@ManagerMapping(value = "/config/rates", method = RequestMethod.GET, role = {ManagerRole.BD_USER, ManagerRole.FINANCIAL_STAFF, ManagerRole.ADMIN})
@ -70,7 +70,7 @@ public class BDPrizeController {
}
@ManagerMapping(value = "/config/bd_levels/{bdId}", method = RequestMethod.PUT, role = {ManagerRole.FINANCIAL_STAFF, ManagerRole.ADMIN})
public void updateBDLevel(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable int bdId, @RequestBody JSONObject info) {
public void updateBDLevel(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String bdId, @RequestBody JSONObject info) {
bdPrizeService.updateBDLevel(bdId, info,manager);
}

1
src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
Unescape View File

@ -318,6 +318,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
orgIds.forEach((p)->{
generateAgent(monthStr,p);
});
generateReferrer(monthStr);
};
new Thread(task).start();
}

6
src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java
Unescape View File

@ -30,21 +30,21 @@ public interface FinancialBDPrizeLogMapper {
@AutoSql(type = SqlType.SELECT)
@AdvanceSelect(addonWhereClause = "prize_type=0")
List<JSONObject> findByReportAndBD(@Param("record_id") String recordId, @Param("manager_id") int managerId);
List<JSONObject> findByReportAndBD(@Param("record_id") String recordId, @Param("manager_id") String managerId);
@Select("SELECT prize_log_id,record_id,manager_id,bd_name,bd_level,SUM(total_amount) total_amount, " +
"SUM(total_prize) total_prize,SUM(total_donation) total_donation, SUM(send_prize) send_prize, " +
"SUM(hold_prize) hold_prize,last_punish,prize_type FROM financial_bd_prize_log fbpl " +
"where fbpl.prize_type = 0 and fbpl.record_id = #{record_id} and fbpl.manager_id = #{manager_id} " +
"GROUP BY fbpl.manager_id")
JSONObject findByReportAndBDTotal(@Param("record_id") String recordId, @Param("manager_id") int managerId);
JSONObject findByReportAndBDTotal(@Param("record_id") String recordId, @Param("manager_id") String managerId);
@Select("SELECT prize_log_id,record_id,manager_id,bd_name,bd_level,SUM(total_amount) total_amount," +
"SUM(total_prize) total_prize,SUM(total_donation) total_donation, SUM(send_prize) send_prize," +
"SUM(hold_prize) hold_prize,last_punish,prize_type FROM financial_bd_prize_log fbpl " +
"where fbpl.prize_type = 1 and fbpl.manager_id = #{manager_id} " +
"GROUP BY fbpl.manager_id ")
JSONObject findByReportAndGroup(@Param("record_id") String recordId, @Param("manager_id") int managerId);
JSONObject findByReportAndGroup(@Param("record_id") String recordId, @Param("manager_id") String managerId);
@AutoSql(type = SqlType.DELETE)
void clearLogsOfReport(@Param("record_id") String recordId);

14
src/main/java/au/com/royalpay/payment/manage/merchants/beans/PartnerQuery.java
Unescape View File

@ -23,7 +23,7 @@ public class PartnerQuery {
private String sub_merchant_id;
private String org_id;
private String org_ids;
private Integer bd;
private String bd;
private String business_structure;
private String industry;
private Integer clean_day;
@ -243,14 +243,6 @@ public class PartnerQuery {
this.org_id = org_id;
}
public Integer getBd() {
return bd;
}
public void setBd(Integer bd) {
this.bd = bd;
}
public void setOnlyMe(boolean onlyMe) {
this.onlyMe = onlyMe;
}
@ -452,4 +444,8 @@ public class PartnerQuery {
public void setOrg_ids(String org_ids) {
this.org_ids = org_ids;
}
public void setBd(String bd) {
this.bd = bd;
}
}

Write Preview
Loading…
Cancel
Save