|
|
|
@ -388,7 +388,7 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
query.setGateway_app("11");
|
|
|
|
|
String clientType = device.getString("client_type");
|
|
|
|
|
DeviceRegister register = deviceSupport.findRegister(clientType);
|
|
|
|
|
Assert.notNull(register);
|
|
|
|
|
Assert.notNull(register,"Device is not registered");
|
|
|
|
|
int client_id = device.getIntValue("client_id");
|
|
|
|
|
JSONObject client = clientManager.getClientInfo(client_id);
|
|
|
|
|
String timezone = client.getString("timezone");
|
|
|
|
@ -779,7 +779,7 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
Date now = new Date();
|
|
|
|
|
JSONObject res = merchantInfoProvider.clientCurrentRate(clientId, now, "Wechat");
|
|
|
|
|
JSONObject client = clientManager.getClientInfo(clientId);
|
|
|
|
|
Assert.notNull(client);
|
|
|
|
|
Assert.notNull(client,"Client is null");
|
|
|
|
|
|
|
|
|
|
JSONObject[] channels = new JSONObject[3];
|
|
|
|
|
|
|
|
|
@ -804,7 +804,7 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
Date now = new Date();
|
|
|
|
|
JSONObject res = merchantInfoProvider.clientCurrentRate(clientId, now, "Wechat");
|
|
|
|
|
JSONObject client = clientManager.getClientInfo(clientId);
|
|
|
|
|
Assert.notNull(client);
|
|
|
|
|
Assert.notNull(client,"Client is null");
|
|
|
|
|
|
|
|
|
|
ArrayList<JSONObject> channels = new ArrayList<>();
|
|
|
|
|
if (client.getBigDecimal("customer_surcharge_rate") != null) {
|
|
|
|
@ -1095,7 +1095,7 @@ public class RetailAppServiceImp implements RetailAppService {
|
|
|
|
|
if (params.getString("type").equals("Merchant")) {
|
|
|
|
|
for (String partner_code : codes) {
|
|
|
|
|
JSONObject client = clientManager.getClientInfoByMoniker(partner_code);
|
|
|
|
|
Assert.notNull(client);
|
|
|
|
|
Assert.notNull(client,"Client is null");
|
|
|
|
|
List<JSONObject> tokens = clientDeviceTokenMapper.listTokensByClient_id(client.getInteger("client_id"));
|
|
|
|
|
if (null != tokens && tokens.size() > 0) {
|
|
|
|
|
for (final JSONObject devToken : tokens) {
|
|
|
|
|