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

bug fix

Browse Source
master
wangning 7 years ago
parent 53d001a965
commit 2228a0cc45
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -20,7 +20,7 @@ import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
import au.com.royalpay.payment.manage.mappers.system.ClientDeviceTokenMapper;
import au.com.royalpay.payment.manage.mappers.system.ClientSettleDelayConfMapper;
import au.com.royalpay.payment.manage.mappers.system.CustomerMapper;
import au.com.royalpay.payment.manage.mappers.system.CustomerRelationAlipayMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerCustomerRelationAlipayMapper;
import au.com.royalpay.payment.manage.merchants.core.ClientManager;
import au.com.royalpay.payment.manage.notice.beans.NoticeInfo;
import au.com.royalpay.payment.manage.notice.core.NoticeManage;
@ -129,7 +129,7 @@ public class RetailAppServiceImp implements RetailAppService {
@Resource
private DeviceSupport deviceSupport;
@Resource
private CustomerRelationAlipayMapper customerRelationAlipayMapper;
private ManagerCustomerRelationAlipayMapper managerCustomerRelationAlipayMapper;
@Resource
private CustomerMapper customerMapper;
@Resource
@ -444,7 +444,7 @@ public class RetailAppServiceImp implements RetailAppService {
}
switch (order.getString("channel")) {
case "Alipay":
JSONObject alipayUser = customerRelationAlipayMapper.findCustomerByUserId(customer_id);
JSONObject alipayUser = managerCustomerRelationAlipayMapper.findCustomerByUserId(customer_id);
if (alipayUser != null) {
order.put("nickname", alipayUser.getString("nickname"));
order.put("headimg", alipayUser.getString("headimg"));
@ -526,7 +526,7 @@ public class RetailAppServiceImp implements RetailAppService {
}
switch (order.getString("channel")) {
case "Alipay":
JSONObject alipayUser = customerRelationAlipayMapper.findCustomerByUserId(customer_id);
JSONObject alipayUser = managerCustomerRelationAlipayMapper.findCustomerByUserId(customer_id);
order.put("nickname", alipayUser.getString("nickname"));
order.put("headimg", alipayUser.getString("headimg"));
break;

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

@ -5,7 +5,7 @@ import au.com.royalpay.payment.manage.apps.core.CustomerImpressionService;
import au.com.royalpay.payment.manage.mappers.client.ClientCustomersMapper;
import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
import au.com.royalpay.payment.manage.mappers.system.CustomerMapper;
import au.com.royalpay.payment.manage.mappers.system.CustomerRelationAlipayMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerCustomerRelationAlipayMapper;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.exceptions.NotFoundException;
import au.com.royalpay.payment.tools.lock.Locker;
@ -46,7 +46,7 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
@Resource
private LookupService lookupService;
@Resource
private CustomerRelationAlipayMapper customerRelationAlipayMapper;
private ManagerCustomerRelationAlipayMapper managerCustomerRelationAlipayMapper;
@Resource
private CustomerMapper customerMapper;
@Resource
@ -146,7 +146,7 @@ public class CustomerImpressionServiceImpl implements CustomerImpressionService
String customer_id = order.getString("customer_id");
JSONObject userInfo = customerMapper.findCustomerByOpenId(customer_id);
if (userInfo == null) {
userInfo = customerRelationAlipayMapper.findCustomerByUserId(customer_id);
userInfo = managerCustomerRelationAlipayMapper.findCustomerByUserId(customer_id);
}
locker.lock(CUSTOMER_IMPRESSION_PREFIX + customer_id, 30_000, 30_000);
try {

6
src/main/java/au/com/royalpay/payment/manage/bill/core/impl/BillOrderServiceImpl.java
Unescape View File

@ -14,7 +14,7 @@ import au.com.royalpay.payment.manage.bill.bean.QueryBillOrderBean;
import au.com.royalpay.payment.manage.bill.core.BillOrderService;
import au.com.royalpay.payment.manage.mappers.bill.BillMapper;
import au.com.royalpay.payment.manage.mappers.bill.BillOrderMapper;
import au.com.royalpay.payment.manage.mappers.system.CustomerRelationAlipayMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerCustomerRelationAlipayMapper;
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
import au.com.royalpay.payment.tools.utils.PageListUtils;
@ -28,7 +28,7 @@ public class BillOrderServiceImpl implements BillOrderService {
@Resource
private BillMapper billMapper;
@Resource
private CustomerRelationAlipayMapper customerRelationAlipayMapper;
private ManagerCustomerRelationAlipayMapper managerCustomerRelationAlipayMapper;
@Override
public List<JSONObject> getByBillId(String bill_id, int client_id) {
@ -39,7 +39,7 @@ public class BillOrderServiceImpl implements BillOrderService {
List<JSONObject> wechatBillOrders = billOrderMapper.findByBillIdWithWechatInfo(bill_id);
for (JSONObject order : wechatBillOrders) {
if ("Alipay".equals(order.getString("channel"))) {
JSONObject alipayInfo = customerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
JSONObject alipayInfo = managerCustomerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
if (alipayInfo != null) {
order.put("nickname", alipayInfo.getString("nickname"));
order.put("headimg", alipayInfo.getString("headimg"));

2
src/main/java/au/com/royalpay/payment/manage/mappers/system/CustomerRelationAlipayMapper.java → src/main/java/au/com/royalpay/payment/manage/mappers/system/ManagerCustomerRelationAlipayMapper.java
Unescape View File

@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Param;
* Created by wangning on 2017/9/19.
*/
@AutoMapper(tablename = "sys_customer_relation_alipay", pkName = "relation_id")
public interface CustomerRelationAlipayMapper {
public interface ManagerCustomerRelationAlipayMapper {
@AutoSql(type = SqlType.INSERT)
void save(JSONObject customer);

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

@ -19,7 +19,7 @@ import au.com.royalpay.payment.manage.mappers.payment.RefundMapper;
import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper;
import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
import au.com.royalpay.payment.manage.mappers.system.CustomerMapper;
import au.com.royalpay.payment.manage.mappers.system.CustomerRelationAlipayMapper;
import au.com.royalpay.payment.manage.mappers.system.ManagerCustomerRelationAlipayMapper;
import au.com.royalpay.payment.manage.merchants.core.ClientManager;
import au.com.royalpay.payment.manage.organizations.core.OrgManager;
import au.com.royalpay.payment.manage.tradelog.beans.PreRefundQueryBean;
@ -126,7 +126,7 @@ public class TradeLogServiceImpl implements TradeLogService {
@Resource
private CustomerMapper customerMapper;
@Resource
private CustomerRelationAlipayMapper customerRelationAlipayMapper;
private ManagerCustomerRelationAlipayMapper managerCustomerRelationAlipayMapper;
@Resource
private ClientCustomersMapper clientCustomersMapper;
@ -316,7 +316,7 @@ public class TradeLogServiceImpl implements TradeLogService {
order.put("nickname", customer.getString("nickname"));
}
JSONObject customerAlipay = customerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
JSONObject customerAlipay = managerCustomerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
if (customerAlipay != null) {
order.put("headimg", customerAlipay.getString("headimg"));
order.put("nickname", customerAlipay.getString("nickname"));
@ -389,7 +389,7 @@ public class TradeLogServiceImpl implements TradeLogService {
order.put("nickname", customer.getString("nickname"));
}
JSONObject customerAlipay = customerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
JSONObject customerAlipay = managerCustomerRelationAlipayMapper.findCustomerByUserId(order.getString("customer_id"));
if (customerAlipay != null) {
order.put("headimg", customerAlipay.getString("headimg"));
order.put("nickname", customerAlipay.getString("nickname"));

2
src/main/ui/static/sys/templates/manual_settle.html
Unescape View File

@ -26,7 +26,7 @@
<tbody>
<tr ng-repeat="contract in manual_settle_analysis">
<td ng-bind="contract.client_moniker"></td>
<td ng-bind="contract.unsettle"></td>
<td ng-bind="contract.unsettle?contract.unsettle:0"></td>
<td ng-bind="contract.request_time|date:'dd/MMM/yyyy'"></td>
</tr>
</tbody>

Write Preview
Loading…
Cancel
Save