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

Merge branch 'hotfi' into develop

Browse Source
master
wangning 7 years ago
parent abc6ba1d7c 28d72b83bc
commit a78fa866c9
8 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -575,8 +575,13 @@ public class RetailAppServiceImp implements RetailAppService {
}
break;
case "Wechat":
JSONObject weUser = customerMapper.findCustomerByOpenId(customer_id);
if (weUser != null) {
JSONObject weUser = new JSONObject();
if (customer_id.startsWith("olH")){
weUser = customerMapper.findCustomerGlobalpayByOpenId(customer_id);
}else {
weUser = customerMapper.findCustomerByOpenId(customer_id);
}
if (weUser != null && !weUser.isEmpty()) {
order.put("nickname", weUser.getString("nickname"));
order.put("headimg", weUser.getString("headimg"));
}

3
src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionServiceImpl.java
Unescape View File

@ -147,6 +147,9 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
if (userInfo == null) {
userInfo = managerCustomerRelationAlipayMapper.findCustomerByUserId(customer_id);
}
if (userInfo == null) {
userInfo = customerMapper.findCustomerGlobalpayByOpenId(customer_id);
}
locker.lock(CUSTOMER_IMPRESSION_PREFIX + customer_id, 30_000, 30_000);
try {
JSONObject clientCustomerInfo = clientCustomersMapper.getClientCustomerWithNull(order.getIntValue("client_id"), customer_id);

4
src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java
Unescape View File

@ -77,4 +77,8 @@ public interface ClientMapper {
@AutoSql(type = SqlType.SELECT)
List<JSONObject> AllClients();
@AutoSql(type = SqlType.SELECT)
@AdvanceSelect(addonWhereClause = "is_valid=1")
List<JSONObject> listClientsByBD(@Param("bd_user") String bd_user);
}

3
src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerMapper.java
Unescape View File

@ -22,6 +22,9 @@ public interface CustomerMapper {
@AutoSql(type = SqlType.SELECT)
JSONObject findCustomerByOpenId(@Param("wechat_openid") String openId);
@AutoSql(type = SqlType.SELECT)
JSONObject findCustomerGlobalpayByOpenId(@Param("globalpay_openid") String openId);
@AutoSql(type = SqlType.SELECT)
@AdvanceSelect(addonWhereClause = "wechat_openid like 'o32%'")
JSONObject findCustomerBykangaOpenid(@Param("kanga_openid") String openId);

2
src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
Unescape View File

@ -296,4 +296,6 @@ public interface ClientManager {
void sendVerifyEmail(JSONObject client,String accountId);
JSONObject getWithConfig(int client_id);
List<JSONObject> getClientsByBD(String bd_user);
}

5
src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
Unescape View File

@ -3456,4 +3456,9 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
clientWithConfig.putAll(clientConfigService.find(client_id));
return clientWithConfig;
}
@Override
public List<JSONObject> getClientsByBD(String bd_user) {
return clientMapper.listClientsByBD(bd_user);
}
}

26
src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
Unescape View File

@ -1,13 +1,7 @@
package au.com.royalpay.payment.manage.merchants.web;
import au.com.royalpay.payment.manage.dev.core.MerchantLocationService;
import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
import au.com.royalpay.payment.manage.merchants.beans.ClientRateConfig;
import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean;
import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
import au.com.royalpay.payment.manage.merchants.beans.SubMerchantIdApply;
import au.com.royalpay.payment.manage.merchants.beans.*;
import au.com.royalpay.payment.manage.merchants.core.ClientManager;
import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
import au.com.royalpay.payment.manage.permission.manager.RequireManager;
@ -17,25 +11,16 @@ import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.http.HttpUtils;
import au.com.royalpay.payment.tools.merchants.beans.QRCodeConfig;
import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import com.alibaba.fastjson.JSONObject;
import org.springframework.validation.Errors;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
/**
* Created by yixian on 2016-06-27.
@ -533,4 +518,5 @@ public class PartnerManageController {
return clientManager.getClientSubMerchantIdLogs(clientMoniker,manager);
}
}

31
src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
Unescape View File

@ -386,10 +386,17 @@ public class TradeLogServiceImpl implements TradeLogService {
TimeZoneUtils.switchTimeZone(order, timezone, "create_time", "confirm_time", "transaction_time");
}
JSONObject customer = customerMapper.findCustomerByOpenId(order.getString("customer_id"));
if (customer != null) {
order.put("headimg", customer.getString("headimg"));
order.put("nickname", customer.getString("nickname"));
JSONObject customer = new JSONObject();
if (order.getString("customer_id") != null) {
if (order.getString("customer_id").startsWith("olH")) {
customer = customerMapper.findCustomerGlobalpayByOpenId(order.getString("customer_id"));
} else {
customer = customerMapper.findCustomerByOpenId(order.getString("customer_id"));
}
if (customer != null && !customer.isEmpty()) {
order.put("headimg", customer.getString("headimg"));
order.put("nickname", customer.getString("nickname"));
}
}
JSONObject customerAlipay = managerCustomerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
@ -469,10 +476,10 @@ public class TradeLogServiceImpl implements TradeLogService {
clientManager.validateClients(client_id, params);
params.put("client_id", client_id);
List<JSONObject> logs = transactionMapper.listTransFlow(params);
logs.stream().forEach(p->{
logs.stream().forEach(p -> {
String login_id = p.getString("login_id");
if(StringUtils.isNotEmpty(login_id)) {
p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail"))?"":p.getString("order_detail"))+"(alipay_id:"+login_id+")");
if (StringUtils.isNotEmpty(login_id)) {
p.put("order_detail", (StringUtils.isEmpty(p.getString("order_detail")) ? "" : p.getString("order_detail")) + "(alipay_id:" + login_id + ")");
}
});
TimeZoneUtils.switchTimeZoneToString(logs, timezone, "dd/MM/yyyy HH:mm:ss", Arrays.asList("transaction_time"));
@ -821,14 +828,14 @@ public class TradeLogServiceImpl implements TradeLogService {
new PageBounds(query.getPage(), query.getLimit(), Order.formString("clearing_time.desc")));
JSONObject result = PageListUtils.buildPageListResult(logs);
result.put("analysis", transactionMapper.getClientAmountAnalysis(params));
if (query.getPage()==1){
if (!logs.isEmpty() && logs.size()>0){
if (query.getPage() == 1) {
if (!logs.isEmpty() && logs.size() > 0) {
JSONObject sendMailLog = logSettleMailMapper.findByDate(logs.get(0).getDate("clearing_time"));
if (sendMailLog == null) {
result.put("padding",true);
result.put("padding", true);
}
if (sendMailLog!=null && sendMailLog.getIntValue("mail_status") != 1) {
result.put("padding",true);
if (sendMailLog != null && sendMailLog.getIntValue("mail_status") != 1) {
result.put("padding", true);
}
}
}

Write Preview
Loading…
Cancel
Save