rollback

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -255,8 +255,8 @@ public class RetailAppServiceImp implements RetailAppService {
         JSONObject res = new JSONObject();
         res.put("url", url);
         res.put("qrcode", QRCodeUtils.qrcodeImageCode(url, 250, false));
-        res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config,clientAccountMapper.findById(device.getString("account_id")),"APP"));
+//        res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config,clientAccountMapper.findById(device.getString("account_id")),"APP"));
-//        res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config));
+        res.put("qrcode_board", merchantInfoProvider.getQrCodeBoard(client, config));
         return res;
     }
 

src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientConfigMapper.java

@@ -27,7 +27,4 @@ public interface ClientConfigMapper {
 
     @AutoSql(type = SqlType.SELECT)
     JSONObject find(@Param("client_id") int client_id);
-
-    @AutoSql(type = SqlType.SELECT)
-    List<JSONObject> getAll();
 }

src/main/java/au/com/royalpay/payment/manage/mappers/system/OrgMapper.java

@@ -47,7 +47,4 @@ public interface OrgMapper {
     PageList<JSONObject> listOrgWithPages(JSONObject paraams, PageBounds order);
 
     List<JSONObject> listOrgAndChild(@Param("org_id") int org_id);
-
-    JSONObject test(@Param("client_id") int client_id);
-
 }

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -1633,8 +1633,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     @Override
     public String getQrCodeBoard(JSONObject client, QRCodeConfig config,JSONObject account,String plantform) {
         // JSONObject org = orgMapper.findOne(client.getIntValue("org_id"));
-//        return merchantInfoProvider.getQrCodeBoard(client, config);
+        return merchantInfoProvider.getQrCodeBoard(client, config);
-        return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform);
+//        return merchantInfoProvider.getQrCodeBoard(client, config,account,plantform);
     }
 
     @Override
@@ -1658,8 +1658,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             qrboardConfig.put("brandw", "600");
             qrboardConfig.put("brandh", "200");
             String type = qrboardConfig.getString("type");
-            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
+//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
-//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
+            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
             board.drawBoardImage(ous);
         } catch (Exception e) {
             throw new ServerErrorException("QR board config not set for current organize", e);
@@ -1679,8 +1679,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             JSONObject qrboardConfig = JSON.parseObject(qrBoardConfigString);
 
             String type = qrboardConfig.getString("type");
-            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
+//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config,mongoTemplate,manager,plantform);
-//            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
+            QRBoard board = QRBoardProvider.getQRBoard(type, qrboardConfig, client, config);
             board.drawBoardImage(ous);
         } catch (Exception e) {
             throw new ServerErrorException("QR board config not set for current organize", e);

src/main/resources/au/com/royalpay/payment/manage/mappers/system/OrgMapper.xml

@@ -70,17 +70,4 @@
 
         </where>
     </select>
-
-
-    <select id="test" resultType="com.alibaba.fastjson.JSONObject">
-        <![CDATA[
-        select sum(clearing_amount) sum,count(DISTINCT(order_id)) counts
-        from pmt_transactions
-        where channel !='Settlement' and
-        transaction_type = 'Credit' and
-        transaction_time>'2018-01-01' and
-        transaction_time<'2018-05-01' and
-        client_id = #{client_id} and system_generate = 0
-        ]]>
-    </select>
 </mapper>

src/test/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionImplTest.java

@@ -10,7 +10,6 @@ import au.com.royalpay.payment.tools.mail.SendMail;
 import com.alibaba.fastjson.JSONObject;
 
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,10 +24,8 @@ import java.net.URISyntaxException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import javax.annotation.Resource;
@@ -185,37 +182,7 @@ public class CustomerImpressionImplTest {
         JSONObject var = new JSONObject();
         var.put("client_moniker", client.getString("client_moniker"));
         var.put("short_name", client.getString("short_name"));
-        JSONObject result = mailGunClient.addListMember(client.getString("contact_email"), "merchants@mail.royalpay.com.au", client.getString("contact_person"),
+        JSONObject result = mailGunClient.addListMember(client.getString("contact_email"), "merchants@mail.royalpay.com.au", client.getString("contact_person"),"",
                 var);
     }
-
-    @Test
-    public void qwe() {
-        List<JSONObject> clients = clientMapper.AllClients();
-        List<JSONObject> clientConfigs = clientConfigMapper.getAll();
-        Map<String, JSONObject> clientConfigMap = new HashMap<>();
-        Map<String, JSONObject> clientMap = new HashMap<>();
-        clientConfigs.forEach(p -> {
-            clientConfigMap.put(p.getString("client_moniker"), p);
-        });
-        clients.forEach(p -> {
-            clientMap.put(p.getString("client_moniker"), p);
-        });
-        String split = "--";
-        String cc = "cc:";
-        String c  = "c";
-        clientConfigMap.values().forEach(p -> {
-            String clientMoniker = p.getString("client_moniker");
-            JSONObject tmpClient = clientMap.get(clientMoniker);
-            tmpClient.keySet().forEach(o->{
-                if(StringUtils.isNotEmpty(p.getString(o))){
-                    if(!tmpClient.getString(o).equals(p.getString(o))){
-                        System.out.println(clientMoniker+split+o+split+cc+p.getString(o)+split+c+tmpClient.getString(o));
-                    }
-
-                }
-            });
-
-        });
-    }
 }