Merge branch 'develop-2.0' into develop

# Conflicts:
#	pom.xml
#	src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java
#	src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientDeviceTokenMapper.java
#	src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java
#	src/main/resources/application-dev.properties
#	src/main/resources/application-local.properties
#	src/main/resources/application.properties

pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>1.1.13</version>
+        <version>2.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.35</version>
+    <version>2.1.1</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
@@ -69,17 +69,11 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.58</version>
+            <version>1.2.62</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/au/com/royalpay/payment/manage/ManagerPersistenceConfiguration.java

@@ -0,0 +1,12 @@
+package au.com.royalpay.payment.manage;
+
+import com.yixsoft.support.mybatis.spring.annotation.MapperScanner;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Create by davep at 2020-03-17 16:53
+ */
+@Configuration
+@MapperScanner({".**.mapper", ".**.mappers"})
+public class ManagerPersistenceConfiguration {
+}

src/main/java/au/com/royalpay/payment/manage/PaymentManageApplication.java

@@ -27,9 +27,9 @@ import java.util.concurrent.ScheduledExecutorService;
  * exclude = {DataSourceAutoConfiguration.class}
  * 禁用springboot默认加载的application.properties单数据源配置
  */
-@SpringBootApplication(scanBasePackages = {"au.com.royalpay.payment", "cn.yixblog"},exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @EnableScheduling
-@EnableCaching( proxyTargetClass=true )
+@EnableCaching(proxyTargetClass = true)
 public class PaymentManageApplication {
 
     public static void main(String[] args) {
@@ -48,7 +48,7 @@ public class PaymentManageApplication {
             if (StringUtils.isNotEmpty(datFile) && new File(datFile).exists()) {
                 return new LookupService(datFile);
             }
-        }catch (IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
         }
         return new LookupService(geoCityFile.getFile());

src/main/java/au/com/royalpay/payment/manage/WebConfiguration.java

@@ -1,12 +1,9 @@
 package au.com.royalpay.payment.manage;
 
 import au.com.royalpay.payment.manage.permission.manager.ManagerUserInterceptor;
-import au.com.royalpay.payment.tools.permission.RequestInfoInterceptor;
 import au.com.royalpay.payment.tools.permission.alipay.AlipayUserInterceptor;
 import au.com.royalpay.payment.tools.permission.consumer.ConsumersInterceptor;
 import au.com.royalpay.payment.tools.permission.wechat.WechatUserInterceptor;
-import au.com.royalpay.payment.tools.secure.impls.ApplyFirewallCheckInterceptor;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -18,8 +15,6 @@ import javax.annotation.Resource;
  */
 @Configuration
 public class WebConfiguration implements WebMvcConfigurer {
-    @Resource
-    private RequestInfoInterceptor requestInfoInterceptor;
     @Resource
     private ManagerUserInterceptor managerUserInterceptor;
     @Resource
@@ -32,17 +27,10 @@ public class WebConfiguration implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(requestInfoInterceptor);
+        registry.addInterceptor(managerUserInterceptor).order(1);
-        registry.addInterceptor(managerUserInterceptor);
+        registry.addInterceptor(wechatUserInterceptor).order(1);
-        registry.addInterceptor(wechatUserInterceptor);
+        registry.addInterceptor(alipayUserInterceptor).order(1);
-        registry.addInterceptor(alipayUserInterceptor);
+        registry.addInterceptor(consumersInterceptor).order(1);
-        registry.addInterceptor(consumersInterceptor);
-        registry.addInterceptor(applyFirewallCheckInterceptor());
-    }
-
-    @Bean
-    public ApplyFirewallCheckInterceptor applyFirewallCheckInterceptor() {
-        return new ApplyFirewallCheckInterceptor();
     }
 
 

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java

@@ -527,7 +527,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
             params.put("client_id",client.getIntValue("client_id"));
         }
         List<JSONObject> records = transactionAnalysisMapper.getCustomersAndOrdersInDaysUseInScheduled(params);
-        if (!records.isEmpty() && records.size()>0){
+        if (!records.isEmpty()){
             JSONObject deleteParams = new JSONObject();
             deleteParams.put("begin",params.getDate("begin"));
             deleteParams.put("end",params.getDate("end"));

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java

@@ -1,6 +1,6 @@
 package au.com.royalpay.payment.manage.analysis.mappers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.analysis.mappers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -32,7 +32,7 @@ public interface ClientAnalysisMapper {
     // 统计一段时期新增的商户数
     List<JSONObject> listNewClients(JSONObject params);
 
-    @AutoSql(type = SqlType.COUNT)
+    @AutoSql(SqlType.COUNT)
     @AdvanceSelect(addonWhereClause = "sub_merchant_id is not null")
     int countTotalPartners();
 

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.analysis.mappers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
-import cn.yixblog.support.mybatis.paginator.annotations.CountRef;
+import com.yixsoft.support.mybatis.paginator.annotations.CountRef;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -16,7 +16,7 @@ import java.util.List;
  */
 @AutoMapper(tablename = "statistics_customer_order", pkName = "id")
 public interface CustomerAndOrdersStatisticsMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject jsonObject);
 
     List<JSONObject> getCustomerAndOrderStatistics(JSONObject params);

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/EstimateAnalysisMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.analysis.mappers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,12 +24,12 @@ public interface EstimateAnalysisMapper {
 
     JSONObject findClearAmountByDate(@Param("report_date") String report_date, @Param("client_list") List<String> client_list);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject estimate);
 
     JSONObject findByLogDate(@Param("date") String date, @Param("log_type") int log_type);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject estimate);
 
     JSONObject getCleanAmount(@Param("start_date") String start_date, @Param("end") String end_date);

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/OrderAnalysisMapper.java

@@ -1,6 +1,6 @@
 package au.com.royalpay.payment.manage.analysis.mappers;
 
-import cn.yixblog.support.mybatis.paginator.annotations.CountRef;
+import com.yixsoft.support.mybatis.paginator.annotations.CountRef;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.java

@@ -1,7 +1,7 @@
 package au.com.royalpay.payment.manage.analysis.mappers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.paginator.annotations.CountRef;
+import com.yixsoft.support.mybatis.paginator.annotations.CountRef;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;

src/main/java/au/com/royalpay/payment/manage/dev/web/TestController.java

@@ -18,9 +18,10 @@ import au.com.royalpay.payment.manage.appclient.core.RetailAppService;
 import au.com.royalpay.payment.manage.dev.bean.AliExcel;
 import au.com.royalpay.payment.manage.dev.bean.Message;
 import au.com.royalpay.payment.manage.dev.bean.SendWechatMessage;
-import au.com.royalpay.payment.manage.dev.core.*;
+import au.com.royalpay.payment.manage.dev.core.AliforexcelService;
-import au.com.royalpay.payment.manage.mappers.customers.CustomerEncourageMoneyUseLogMapper;
+import au.com.royalpay.payment.manage.dev.core.HfClearAmountService;
-import au.com.royalpay.payment.manage.mappers.log.NotifyErrorLogMapper;
+import au.com.royalpay.payment.manage.dev.core.HfUpdateService;
+import au.com.royalpay.payment.manage.dev.core.WechatMessageService;
 import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
 import au.com.royalpay.payment.manage.mappers.payment.RefundMapper;
 import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper;
@@ -57,8 +58,6 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.util.Assert;
 import org.springframework.util.MimeTypeUtils;
 import org.springframework.validation.Errors;
@@ -86,7 +85,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/dev")
-public class TestController implements ApplicationEventPublisherAware {
+public class TestController {
     private Logger logger = LoggerFactory.getLogger(getClass());
     @Resource
     private OrderMapper orderMapper;
@@ -96,8 +95,6 @@ public class TestController implements ApplicationEventPublisherAware {
     private ClientMapper clientMapper;
     @Resource
     private ATOReportService atoReportService;
-    @Resource
-    private NotifyErrorLogMapper notifyErrorLogMapper;
     @Value("${app.agreetemplate.classic.path}")
     private String pdfPath;
     @Value("${app.agreetemplate.aggregate.path}")
@@ -107,8 +104,6 @@ public class TestController implements ApplicationEventPublisherAware {
     @Resource
     private PlatformClearService platformClearService;
     @Resource
-    private CustomerEncourageMoneyUseLogMapper customerEncourageMoneyUseLogMapper;
-    @Resource
     private ClientBankAccountMapper clientBankAccountMapper;
     @Resource
     private PaymentApi paymentApi;
@@ -128,12 +123,9 @@ public class TestController implements ApplicationEventPublisherAware {
     private TradeLogService tradeLogService;
     @Resource
     private RetailAppService retailAppService;
-    private ApplicationEventPublisher publisher;
     @Resource
     private WechatMessageService wechatMessageService;
     @Resource
-    private NewpartnerService newpartnerService;
-    @Resource
     private AliforexcelService aliforexcelService;
     @Resource
     private HfClearAmountService hfClearAmountService;
@@ -423,12 +415,6 @@ public class TestController implements ApplicationEventPublisherAware {
         tradeLogService.generateAustracData(datefrom, dateto);
     }
 
-
-    @Override
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-        this.publisher = applicationEventPublisher;
-    }
-
     @PutMapping("/send_message")
     public void sendMassageByCode(@RequestBody @Valid Message message, Errors errors) {
         HttpUtils.handleValidErrors(errors);
@@ -578,13 +564,14 @@ public class TestController implements ApplicationEventPublisherAware {
 
     /**
      * 重新生成执行商户下某日消费者数据
+     *
      * @param date
      * @param clientId
      */
     @GetMapping("/task/analysisCustomerDashboard")
-    public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date,@RequestParam("clientId")String clientId){
+    public void analysisCustomerDashboardForClientMoniker(@RequestParam("date") String date, @RequestParam("clientId") String clientId) {
         try {
-            dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1),clientId);
+            dashboardService.generateCustomersAndOrdersStatisticsByClientMoniker(DateUtils.addDays(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(date), -1), clientId);
         } catch (ParseException e) {
             e.printStackTrace();
         }

src/main/java/au/com/royalpay/payment/manage/mappers/act/ActAppMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.act;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -15,20 +15,20 @@ import java.util.List;
 @AutoMapper(tablename = "act_app_list", pkName = "act_id")
 public interface ActAppMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid=1")
     List<JSONObject> listActs ();
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listAppActs (JSONObject params,PageBounds pagination);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject getActDetail(String act_id);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateAct(JSONObject params);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void newAppAct(JSONObject params);
 
     JSONObject getLatestWindowNotice(@Param("now") Date now);

src/main/java/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.act;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -17,10 +17,10 @@ import java.util.List;
 @AutoMapper(tablename = "act_charity", pkName = "client_moniker")
 public interface ActChairtyMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findChairtyClient(@Param("client_moniker") String clientMoniker);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject chairtyClient);
 
     PageList<JSONObject> chairtyClientNum(PageBounds pageBounds);

src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietAttendMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.act;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -18,16 +18,16 @@ import java.util.List;
 @AutoMapper(tablename = "act_diet_attend", pkName = "attend_id", keyGenerator = Jdbc3KeyGenerator.class)
 public interface ActDietAttendMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "enabled=1")
     JSONObject findClientAttend(@Param("client_id") String clientId);
 
     PageList<JSONObject> listMerchants(@Param("city") String city, @Param("name") String name, PageBounds pageBounds);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject attend);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject attend);
 
     PageList<JSONObject> listMerchantsDetail(PageBounds pageBounds);

src/main/java/au/com/royalpay/payment/manage/mappers/act/ActDietOrderMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.act;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,16 +14,16 @@ import java.util.List;
  */
 @AutoMapper(tablename = "act_diet_orders", pkName = "order_id")
 public interface ActDietOrderMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject dietOrderInfo);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOrder(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void setTransactionId(@Param("order_id") String orderId, @Param("transaction_id") String transactionId, @Param("pay_time") Date time);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateRefund(@Param("order_id") String orderId, @Param("refund_transaction") String transactionId, @Param("refund_time") Date transactionTime);
 
     List<JSONObject> getAppendAmountInDays(JSONObject params);

src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelayClientMapper.java

@@ -1,20 +1,20 @@
 package au.com.royalpay.payment.manage.mappers.act;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
 
 @AutoMapper(tablename = "act_mon_delay_read_logs", pkName = "id")
 public interface ActMonDelayClientMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject clientlog);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject clientlog);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject actClient(@Param("client_id") int client_id);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.act;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -13,13 +13,13 @@ import java.util.List;
 
 @AutoMapper(tablename = "act_mon_delay_settle", pkName = "id")
 public interface ActMonDelaySettleMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject clientlog);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject clientlog);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid=1")
     List<JSONObject> clientLog (@Param("client_id") int client_id);
 

src/main/java/au/com/royalpay/payment/manage/mappers/act/ActMonDelaySettleRedPackMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.act;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -13,12 +13,12 @@ import java.util.List;
 
 @AutoMapper(tablename = "act_mon_delay_settle_redpack", pkName = "id")
 public interface ActMonDelaySettleRedPackMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject dietOrderInfo);
 
     BigDecimal getTotalRedPack(int client_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listRedpacks(@Param("client_id") int client_id, PageBounds pagination);
 
     PageList<JSONObject> getMonDelayRank(JSONObject params, PageBounds pageBounds);

src/main/java/au/com/royalpay/payment/manage/mappers/act/ActSignEventsSignLogMapper.java

@@ -7,9 +7,9 @@ import org.apache.ibatis.annotations.Param;
 import java.util.Date;
 import java.util.List;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2017-04-11.
@@ -19,9 +19,9 @@ public interface ActSignEventsSignLogMapper {
 
     List<JSONObject> checkUnsigned(@Param("client_id") int clientId);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateSignInfo(@Param("sign_id") String signId, @Param("sign_time") Date signTime, @Param("sign_user_id") String userId, @Param("sign_ip") String clientIp);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject find(@Param("sign_id") String signId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillMapper.java

@@ -8,28 +8,28 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Create by yixian at 2017-12-19 19:09
  */
 @AutoMapper(tablename = "pmt_bill", pkName = "bill_id")
 public interface BillMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     int save(JSONObject record);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOne(@Param("bill_id") String bill_id);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     int update(JSONObject record);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findByClientId(@Param("client_id") int client_id);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void delete(@Param("bill_id") String billId);
 
     PageList<JSONObject> listWithOrderAnalysis(@Param("param") JSONObject jsonObject, PageBounds pageBounds);

src/main/java/au/com/royalpay/payment/manage/mappers/bill/BillOrderMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.bill;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -15,20 +15,20 @@ import java.util.List;
  */
 @AutoMapper(tablename = "pmt_bill_order_relation", pkName = "bill_id")
 public interface BillOrderMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     JSONObject save(JSONObject record);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     int update(JSONObject record);
 
     List<JSONObject> findByBillIdWithWechatInfo(@Param("bill_id") String bill_id);
 
     List<JSONObject> findByBillIdWithAlipayInfo(@Param("bill_id") String bill_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByClientId(@Param("client_id") int client_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findByBillId(@Param("bill_id") String bill_id);
 
     List<String> findOrderIdByStatus(@Param("order_status")String order_status);

src/main/java/au/com/royalpay/payment/manage/mappers/billqrcode/DirectedBillCodeMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.billqrcode;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -12,22 +12,22 @@ import java.util.List;
 
 @AutoMapper(tablename = "pmt_directed_bill_code", pkName = "bill_code_id")
 public interface DirectedBillCodeMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     int save(JSONObject record);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOne(@Param("client_order_id") String client_order_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOneByBillCodeId(@Param("bill_code_id") String bill_code_id);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     int update(JSONObject record);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findByClientId(JSONObject params, PageBounds pageBounds);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "status=1")
     List<JSONObject> listAllBills();
 }

src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackDrawDepositsMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.cashback;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -16,10 +16,10 @@ import java.math.BigDecimal;
 public interface CashbackDrawDepositsMapper {
 
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject object);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> getDrawLogs(JSONObject params, PageBounds pageBounds);
 
     BigDecimal getDrawTotal(JSONObject params);

src/main/java/au/com/royalpay/payment/manage/mappers/cashback/CashbackRecordsMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.cashback;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -20,10 +20,10 @@ public interface CashbackRecordsMapper {
 
     BigDecimal getCashTotal(JSONObject params);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject object);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject object);
 
     PageList<JSONObject> getCashbackRecores(JSONObject params, PageBounds pageBounds);
@@ -38,7 +38,7 @@ public interface CashbackRecordsMapper {
 
     PageList<JSONObject> getPartnerTotalCashback(JSONObject params, PageBounds pageBounds);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findByOrderId(@Param("order_id") String orderId);
 
     List<JSONObject> findBySurchargeDiscountLog(@Param("client_id") int clientId, @Param("settle_date") Date settleDate);

src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.cashiers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -17,21 +17,21 @@ import java.util.List;
 @AutoMapper(tablename = "cashier", pkName = "cashier_id")
 public interface CashierMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listCashiers(JSONObject params);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listCashiers(JSONObject params, PageBounds pageBounds);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOne(@Param("cashier_id") String cashier_id);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject cashier);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject cashier);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findCashierByCode(@Param("client_id") int client_id, @Param("code") String code);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/cashiers/CashierOrderMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.cashiers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -14,15 +14,15 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "cashier_orders", pkName = "cashier_order_id")
 public interface CashierOrderMapper {
-    @AutoSql(type= SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject jsonObject);
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject updateaObj);
-    @AutoSql(type= SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOrder(@Param("cashier_order_id") String cashier_order_id);
 
     PageList<JSONObject> listOrders(JSONObject params, PageBounds pageBounds);
-    @AutoSql(type= SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOrderByOrderId(@Param("order_id") String cashier_order_id);
 
 

src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthAppMessageMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.client;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 
 /**
@@ -10,6 +10,6 @@ import com.alibaba.fastjson.JSONObject;
  */
 @AutoMapper(tablename = "log_client_app_messages",pkName = "message_id")
 public interface AuthAppMessageMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject msg);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/client/AuthHistoryMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.client;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Param;
 public interface AuthHistoryMapper {
 
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject find(@Param("auth_id") String authId);
 
 }

src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientCustomersMapper.java

@@ -6,24 +6,24 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yuan on 2017/9/12.
  */
 @AutoMapper(tablename = "sys_clients_customers", pkName = {"client_id","customer_id"})
 public interface ClientCustomersMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     public JSONObject getClientCustomer(@Param("client_id") int client_id, @Param("customer_id") String customer_id);
 
     public JSONObject getClientCustomerWithNull(@Param("client_id") int client_id, @Param("customer_id") String customer_id);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     public void insert(JSONObject obj);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     public void update(JSONObject obj);
 
     public void updateAfterPaymentFinish(JSONObject obj);

src/main/java/au/com/royalpay/payment/manage/mappers/client/ClientSubMerchantIdMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.client;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -13,20 +13,20 @@ import java.util.List;
 
 @AutoMapper(tablename = "cli_sub_merchant_id", pkName = "sub_merchant_id")
 public interface ClientSubMerchantIdMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listSubMerchantId(PageBounds pageBounds);
 
     List<JSONObject> listSubMerchantIdByDiffDays(@Param("begin") int begin,@Param("end") int end);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject subMerchantId);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject subMerchantId);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void delete(@Param("sub_merchant_id") String sub_merchant_id);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void deleteAll();
 }

src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.client;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -14,16 +14,16 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "pat_goods", pkName = "id")
 public interface GoodMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findGood(@Param("id") String goodId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_using=1")
     PageList<JSONObject> listGoods(JSONObject params, PageBounds pagination);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject good);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject good);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/client/GoodOrderMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.client;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -15,18 +15,18 @@ import java.util.List;
  */
 @AutoMapper(tablename = "pat_goods_sale", pkName = "id")
 public interface GoodOrderMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findGoodOrder(@Param("id") String goodOrderId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listGoodOrder(JSONObject params, PageBounds pagination);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> getGoodOrderList(JSONObject params);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject goodOrder);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject goodOrder);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportDetailsMapper.java

@@ -8,16 +8,16 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yishuqian on 9/1/16.
  */
 @AutoMapper(tablename = "pmt_custom_report_detail", pkName = "sub_order_no")
 public interface CustomReportDetailsMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findByReportId(@Param("report_id") String report_id);
 
 }

src/main/java/au/com/royalpay/payment/manage/mappers/custom/CustomReportsMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.custom;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -13,10 +13,10 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "pmt_custom_report", pkName = "report_id")
 public interface CustomReportsMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOne(@Param("report_id") String report_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByOrderId(@Param("order_id")String order_id);
 
     PageList<JSONObject> queryWithTrans(JSONObject param,PageBounds pagination);

src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardConfigMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.customers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "cus_reward_config",pkName = "key")
 public interface CusRewardConfigMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject getValue(@Param("key") String key);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardCouponMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.customers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -14,6 +14,6 @@ public interface CusRewardCouponMapper {
     @Select("SELECT * FROM cus_reward_coupon WHERE type =2 or type =3 order by rand() limit 1")
     JSONObject randomType();
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject getCoupon(@Param("type") int type);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/customers/CusRewardLogsMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.customers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -13,16 +13,16 @@ import java.util.List;
 
 @AutoMapper(tablename = "cus_reward_log",pkName = "reward_id")
 public interface CusRewardLogsMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject params);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findRewardByFakeOpenId(@Param("openid")String fakeOpenId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findRewardByRewardId(@Param("reward_id")String reward_id);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject params);
 
     int openIdReceivedCount(@Param("openid") String openid, @Param("send_time") Date send_time);

src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageConfigMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.customers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -17,16 +17,16 @@ public interface CustomerEncourageConfigMapper {
 
     JSONObject currentConfig();
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listConfigs(PageBounds pagination);
 
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findConfig(@Param("event_id") String eventId);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject config);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void newEvent(JSONObject event);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyAccessLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.customers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -19,13 +19,13 @@ public interface CustomerEncourageMoneyAccessLogMapper {
 
     int countOrders(@Param("member_id") String memberId, @Param("date") Date queryDate);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByOrderId(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject log);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject log);
 
     PageList<JSONObject> list(JSONObject params, PageBounds pageBounds);

src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerEncourageMoneyUseLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.customers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -18,13 +18,13 @@ import java.util.List;
 @AutoMapper(tablename = "cus_encourage_money_use_log", pkName = "use_id")
 public interface CustomerEncourageMoneyUseLogMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByOrderId(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject useLog);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject useLogUpdate);
 
     BigDecimal sumUsed(@Param("member_id") String memberId, @Param("from_date") Date fromDate, @Param("to_date") Date toDate);

src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerMembershipMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.customers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,16 +16,16 @@ import java.util.List;
 @AutoMapper(tablename = "cus_membership",pkName = "member_id")
 public interface CustomerMembershipMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByPaymentOpenId(@Param("payment_openid") String openid);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByMemberId(@Param("member_id") String memberId);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveMember(JSONObject member);
 
-    @AutoSql(type= SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     int updateCustomerPoints(@Param("member_id") String memberId, @Param("member_point") int memberPoints);
 
     void useEncourage(@Param("memberId") String memberId, @Param("amount") BigDecimal amount);

src/main/java/au/com/royalpay/payment/manage/mappers/customers/CustomerPointsMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.customers;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,17 +15,17 @@ import java.util.Date;
 @AutoMapper(tablename = "cus_points_access_log",pkName = "point_id")
 public interface CustomerPointsMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findPointLog(@Param("point_id") String pointId);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject pointLog);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "refund_id is null")
     JSONObject getPointLog(@Param("order_id") String order_id, @Param("member_id") String member_id);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject pointLog);
 
     int getOuttimePoints(@Param("member_id") String memberId, @Param("expire_date") Date date);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionDetailMapper.java

@@ -6,19 +6,19 @@ import org.apache.ibatis.annotations.Param;
 
 import com.alibaba.fastjson.JSONObject;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2017-03-08.
  */
 @AutoMapper(tablename = "financial_agent_commission_detail", pkName = "detail_id")
 public interface FinancialAgentCommissionDetailMapper {
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearData(@Param("year") int year, @Param("month") int month);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject detail);
 
     List<JSONObject> listDetails(@Param("record_id") String recordId);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialAgentCommissionMapper.java

@@ -6,19 +6,19 @@ import org.apache.ibatis.annotations.Param;
 
 import com.alibaba.fastjson.JSONObject;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2017-03-08.
  */
 @AutoMapper(tablename = "financial_agent_commission", pkName = "record_id")
 public interface FinancialAgentCommissionMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject commissionAnalysis);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearData(@Param("year") int year, @Param("month") int month);
 
     List<Integer> listAvailableMonths(@Param("year") int year);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDCommissionConfigMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,13 +22,13 @@ public interface FinancialBDCommissionConfigMapper {
     //获取历史月份 Leader 、Manager信息
     List<JSONObject> listBDLeMaInfoHistory(String month);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateCommissionConfig(JSONObject configInfo);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void insertCommissionConfig(JSONObject configInfo);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void deleteConfig(@Param("bc_config_id") String configInfo);
 
     JSONObject findCurrentCommissionRate(@Param("month") String month, @Param("amount") String amount, @Param("bd_type") int bd_type);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDConfigMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,13 +16,13 @@ import java.util.List;
  */
 @AutoMapper(tablename = "financial_bd_config",pkName = "manager_id")
 public interface FinancialBDConfigMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject getBdConfig(@Param("manager_id") String userId);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveBDConfig(JSONObject config);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateBDConfig(JSONObject config);
 
     List<JSONObject> listBDConfig();

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeDetailMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -15,7 +15,7 @@ import java.util.List;
 @AutoMapper(tablename = "financial_bd_prize_detail", pkName = "detail_id")
 public interface FinancialBDPrizeDetailMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject detail);
 
     List<JSONObject> listDetails(@Param("prize_log_id") String prizeLogId, PageBounds order);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -17,7 +17,7 @@ import java.util.List;
  */
 @AutoMapper(tablename = "financial_bd_prize_log", pkName = "prize_log_id")
 public interface FinancialBDPrizeLogMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject log);
 
     @Select("SELECT fbpl.prize_log_id,fbpl.record_id,fbpl.manager_id,fbpl.bd_name,fbpl.kpi_amount,fbpl.bd_level,SUM(fbpl.total_amount) total_amount, " +
@@ -29,7 +29,7 @@ public interface FinancialBDPrizeLogMapper {
             "GROUP BY fbpl.manager_id order by total_amount desc")
     List<JSONObject> listPrizeLogsForReport(@Param("prize_type") int prize_type, @Param("record_id") String recordId, PageBounds order);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "prize_type=0")
     List<JSONObject> findByReportAndBD(@Param("record_id") String recordId, @Param("manager_id") String managerId);
 
@@ -68,7 +68,7 @@ public interface FinancialBDPrizeLogMapper {
             "GROUP BY fbpl.manager_id ")
     JSONObject findByReportAndGroup(@Param("record_id") String recordId, @Param("manager_id") String managerId);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearLogsOfReport(@Param("record_id") String recordId);
 
     @Select("select bpl.record_id,bpl.manager_id,bpl.bd_name,sum(bpl.total_amount) total_amount,sum(bpl.total_prize) total_prize,sum(bpl.total_donation) total_donation,sum(bpl.send_prize) send_prize,sum(bpl.hold_prize) hold_prize," +
@@ -80,7 +80,7 @@ public interface FinancialBDPrizeLogMapper {
             "ORDER BY bpr.month desc")
     List<JSONObject> listBdPrizeLogByOne(@Param("manager_id") String manager_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findReportByOne(@Param("record_id") String recordId, @Param("manager_id") String managerId);
 
     @Select("SELECT c.manager_id, SUM(total_amount) total_amount, c.bd_type\n" +

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeRecordMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,10 +14,10 @@ import java.util.List;
 @AutoMapper(tablename = "financial_bd_prize_records", pkName = "record_id")
 public interface FinancialBDPrizeRecordMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject record);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByMonth(@Param("month") String month);
 
     List<JSONObject> listRecordsInYear(@Param("year") String year);
@@ -28,7 +28,7 @@ public interface FinancialBDPrizeRecordMapper {
 
     JSONObject getChannelReport(@Param("record_id") String recordId, @Param("channel") String channel);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void delete(@Param("record_id") String recordId);
 
     List<JSONObject> getReportByManagerId(@Param("manager_id") String managerId);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDRateConfigMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
 
@@ -13,9 +13,9 @@ import java.util.List;
  */
 @AutoMapper(tablename = "financial_bd_prize_rate_config", pkName = "config_id", keyGenerator = Jdbc3KeyGenerator.class)
 public interface FinancialBDRateConfigMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listAllConfig();
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     int update(JSONObject update);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialLeaderPrizeLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,9 +11,9 @@ import java.util.List;
 @AutoMapper(tablename = "financial_leader_prize_log", pkName = "leader_prize_log")
 public interface FinancialLeaderPrizeLogMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listLeaderPrizeLog(@Param(value = "record_id") String record_id);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject prizeLog);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionDetailMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,16 +13,16 @@ import java.util.List;
  */
 @AutoMapper(tablename = "financial_partner_commission_detail", pkName = "detail_id")
 public interface FinancialPartnerCommissionDetailMapper {
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearData(@Param("year") int year, @Param("month") int month,@Param("commission_type") int commission_type);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject detail);
 
     List<JSONObject> listDetails(@Param("record_id") String recordId);
 
     List<JSONObject> listDetailsByRecordIds(List<String> recordId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listDetailByMonth(@Param("year") int year, @Param("month") int month);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialPartnerCommissionMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -16,13 +16,13 @@ import java.util.List;
  */
 @AutoMapper(tablename = "financial_partner_commission", pkName = "record_id")
 public interface FinancialPartnerCommissionMapper {
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearData(@Param("year") int year, @Param("month") int month,@Param("commission_type") int commission_type);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject commissionAnalysis);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject commission);
 
     List<JSONObject> getOrgPrizeList(@Param("org_id") String orgId);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionDetailMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,10 +13,10 @@ import java.util.List;
  */
 @AutoMapper(tablename = "financial_referrer_commission_detail", pkName = "detail_id")
 public interface FinancialReferrerCommissionDetailMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject commissionAnalysis);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearData(@Param("year") int year, @Param("month") int month);
 
     List<JSONObject> listDetailsByRecordIds(List<String> recordId);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialReferrerCommissionMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.financial;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,10 +13,10 @@ import java.util.List;
  */
 @AutoMapper(tablename = "financial_referrer_commission", pkName = "record_id")
 public interface FinancialReferrerCommissionMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject commissionAnalysis);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearData(@Param("year") int year, @Param("month") int month);
 
     List<Integer> listAvailableMonths(@Param("year") int year);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionDetailMapper.java

@@ -6,25 +6,25 @@ import org.apache.ibatis.annotations.Param;
 
 import com.alibaba.fastjson.JSONObject;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2017-03-08.
  */
 @AutoMapper(tablename = "financial_senior_partner_commission_detail", pkName = "id")
 public interface FinancialSeniorPartnerCommissionDetailMapper {
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearData(@Param("year") int year, @Param("month") int month,@Param("commission_type") int commission_type);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject detail);
 
     List<JSONObject> listDetails(@Param("record_id") String recordId);
 
     List<JSONObject> listDetailsByRecordIds(List<String> recordId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listDetailByMonth(@Param("year") int year, @Param("month") int month);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialSeniorPartnerCommissionMapper.java

@@ -6,21 +6,21 @@ import org.apache.ibatis.annotations.Param;
 
 import com.alibaba.fastjson.JSONObject;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2017-03-08.
  */
 @AutoMapper(tablename = "financial_senior_partner_commission", pkName = "id")
 public interface FinancialSeniorPartnerCommissionMapper {
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void clearData(@Param("year") int year, @Param("month") int month);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject commissionAnalysis);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject find(@Param("year") int year, @Param("month") int month, @Param("org_id") String orgId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/funds/FundsConfigMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.funds;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,12 +14,12 @@ import java.util.List;
  */
 @AutoMapper(tablename = "fund_basic_config", pkName = "type_id")
 public interface FundsConfigMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listAll();
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject find(@Param("type_id") String typeId);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateRate(@Param("type_id") String typeId, @Param("rate") BigDecimal rate);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestClientLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.funds;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -14,7 +14,7 @@ import java.util.List;
  */
 @AutoMapper(tablename = "fund_xplan_interest_client_history", pkName = "detail_id")
 public interface XPlanInterestClientLogMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject detail);
 
     List<JSONObject> listMerchantLogs(@Param("history_id") String historyId, PageBounds pagination);

src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanInterestLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.funds;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -16,13 +16,13 @@ import java.util.Date;
 @AutoMapper(tablename = "fund_xplan_interest_history", pkName = "history_id")
 public interface XPlanInterestLogMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> interestLog(PageBounds pagination);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject interest);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject getTransLogByDate(@Param("date") Date date);
 
     PageList<JSONObject> list(JSONObject params, PageBounds pagination);

src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanMerchantMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.funds;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -16,14 +16,14 @@ import java.math.BigDecimal;
 @AutoMapper(tablename = "fund_xplan_merchants", pkName = "client_id")
 public interface XPlanMerchantMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findMerchantConfig(@Param("client_id") int clientId);
 
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject config);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject update);
 
     void deposit(@Param("client_id") int clientId, @Param("amount") BigDecimal amount);

src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanOperationLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.funds;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 
 /**
@@ -11,6 +11,6 @@ import com.alibaba.fastjson.JSONObject;
 @AutoMapper(tablename = "fund_xplan_log_operation",pkName = "operation_id")
 public interface XPlanOperationLogMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveLog(JSONObject log);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/funds/XPlanTransactionMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.funds;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -17,19 +17,19 @@ import java.util.List;
  */
 @AutoMapper(tablename = "fund_xplan_transactions", pkName = "transaction_id")
 public interface XPlanTransactionMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveTransaction(JSONObject transaction);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listMerchantTransactions(JSONObject params, PageBounds pagination);
 
     List<JSONObject> listDailyTransactions(@Param("client_id") int clientId, @Param("date") Date date);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findTransaction(@Param("transaction_id") String transactionId);
 
     BigDecimal analysisMerchantTotalAchieve(@Param("client_id") int clientId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findByRequestId(@Param("client_id") int clientId, @Param("request_id") String requestId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/AppMessageLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,11 +11,11 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "log_app_msg", pkName = "send_id")
 public interface AppMessageLogMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject log);
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateStatus(@Param("send_id") String id, @Param("status") int status, @Param("remark") String remark);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject object);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailAnalysisMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
@@ -16,14 +16,14 @@ import java.util.List;
  */
 @AutoMapper(tablename = "log_clearing_detail_analysis", pkName = "detail_id", keyGenerator = Jdbc3KeyGenerator.class)
 public interface ClearingDetailAnalysisMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject channel);
 
     List<JSONObject> analysisChannelReport(@Param("clearing_id") int clearingId);
 
     List<JSONObject> analysisChannelReportDaily(@Param("settle_date") Date settleDate);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listReportChannels(@Param("clearing_detail_id") String clearDetailId);
 
     List<JSONObject> listReportChannelsOfMergeSettle(@Param("report_date") String reportDate, @Param("client_id") int clientId);

src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingDetailMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -17,13 +17,13 @@ import java.util.List;
  */
 @AutoMapper(tablename = "log_clearing_detail", keyGenerator = Jdbc3KeyGenerator.class, pkName = "clear_detail_id")
 public interface ClearingDetailMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject detail);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject find(@Param("client_id") int clientId, @Param("clearing_id") int clearId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByDetailId(@Param("clear_detail_id") int clearDetailId);
 
     List<JSONObject> listReports(@Param("client_id") int clientId, @Param("month") Date month);
@@ -34,22 +34,22 @@ public interface ClearingDetailMapper {
 
     PageList<JSONObject> listReportsOfSettlementLogs(JSONObject params, PageBounds pagination);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject listReport(@Param("clear_detail_id") String clearDetailId, @Param("client_id") int client_id);
 
     JSONObject listReportOfMergeSettle(@Param("report_date") String reportDate, @Param("client_id") int client_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject listReportByDate(@Param("report_date") Date date, @Param("client_id") int clientId);
 
     PageList<JSONObject> listClientSettlementLog(JSONObject params, PageBounds pagination);
 
     void updateAllBanks(@Param("settle_bank") String bank, @Param("clearing_id") int clearingId);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateBanks(@Param("settle_bank") String bank,@Param("clear_detail_id") List<String> clearingDetailIds);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void deleteSettleLogs(@Param("clearing_id") int clearingId);
 
     List<JSONObject> batchReport(@Param("clearing_id") int clearingId);

src/main/java/au/com/royalpay/payment/manage/mappers/log/ClearingLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
@@ -16,7 +16,7 @@ import java.util.List;
 @AutoMapper(tablename = "log_clearing", pkName = "clearing_id", keyGenerator = Jdbc3KeyGenerator.class)
 public interface ClearingLogMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject clearingLog);
 
     List<JSONObject> findByDate(Date date);
@@ -29,7 +29,7 @@ public interface ClearingLogMapper {
 
     JSONObject getTotalPlatformCharge(@Param("year") int year, @Param("month") int month);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject update);
 
     List<JSONObject> getSettlementChannelsMonthReport(@Param("year") int year, @Param("month") int month);
@@ -44,12 +44,12 @@ public interface ClearingLogMapper {
 
     void lockSettlementsById(@Param("clearing_ids") List<String> clearingIds);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findById(@Param("clearing_id") int clearingId);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void setLogEditable(@Param("editable") boolean editable, @Param("clearing_id") int clearingId);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void deleteSettleLogs(@Param("clearing_id") int clearingId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientConfigLogMapper.java

@@ -6,15 +6,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2016-10-14.
  */
 @AutoMapper(tablename = "log_client_config", pkName = "id")
 public interface ClientConfigLogMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveLog(JSONObject log);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientLoginLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -14,10 +14,10 @@ import org.apache.ibatis.annotations.Param;
 @AutoMapper(tablename = "log_client_login", pkName = "id")
 public interface ClientLoginLogMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveLog(JSONObject log);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listAccountLog(@Param("account_id") String accountId, PageBounds pagination);
 
     PageList<JSONObject> listClientLog(JSONObject params, PageBounds pagination);

src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientReviewLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,10 +14,10 @@ import java.util.List;
  */
 @AutoMapper(tablename = "log_client_review",pkName = "review_id")
 public interface ClientReviewLogMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject review);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findReviewLog(@Param("client_id") int clientId, @Param("review_date") Date date);
 
     List<JSONObject> listReviewLogs(@Param("clientId") int clientId, @Param("from") Date from, @Param("to") Date to);

src/main/java/au/com/royalpay/payment/manage/mappers/log/ClientsOperationLogMapper.java

@@ -2,15 +2,15 @@ package au.com.royalpay.payment.manage.mappers.log;
 
 import com.alibaba.fastjson.JSONObject;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2017-04-18.
  */
 @AutoMapper(tablename = "log_clients_operation",pkName = "id")
 public interface ClientsOperationLogMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject review);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/CouponAccuessLogMapper.java

@@ -8,34 +8,34 @@ import org.apache.ibatis.annotations.Param;
 
 import com.alibaba.fastjson.JSONObject;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 @AutoMapper(tablename = "cus_coupon_accuess_log", pkName = "accuess_id")
 public interface CouponAccuessLogMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject params);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject params);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid = 1")
     JSONObject findUsedCouponByOrderId(@Param("order_id") String order_id);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findCouponByOrderId(@Param("order_id") String order_id);
 
     PageList<JSONObject> getCouponAccuessLog(@Param("client_id")int client_id, @Param("keyword")String keyword, PageBounds pageBounds);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid = 0")
     List<JSONObject> findAccuessLogByOrderId(@Param("order_id") String order_id, PageBounds pageBounds);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid = 1")
     List<JSONObject> findUsedCouponByOrderIdList(@Param("order_id") String order_id);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/DailyReportMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,12 +11,12 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "log_daily_report", pkName = "report_id")
 public interface DailyReportMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject report);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOne(@Param("report_id") String reportId);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void delete(@Param("report_id") String reportId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/GatewayClientApplyNotifyLogMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,16 +15,16 @@ import java.util.List;
 @AutoMapper(tablename = "gateway_clientApply_notify_log", pkName = "id")
 public interface GatewayClientApplyNotifyLogMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveLog(JSONObject log);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject notice);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "success=0 and addtime(`addtime`,'24:00:00')>now()")
     List<JSONObject> listErrorLogsIn24Hour();
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findHistoryByClientId(@Param("client_id") int clientId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/LogClientSubMerchantIdMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -12,9 +12,9 @@ import java.util.List;
 @AutoMapper(tablename = "log_client_sub_merchant_id", pkName = "id")
 public interface LogClientSubMerchantIdMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject log);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listLogsByClientId(@Param("client_id") int client_id, PageBounds pageBounds);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/LogRiskMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -15,7 +15,7 @@ import java.util.List;
 @AutoMapper(tablename = "log_risk", pkName = "id")
 public interface LogRiskMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject cashier);
 
     PageList<JSONObject> listWithClientInfo(JSONObject params, PageBounds pagination);

src/main/java/au/com/royalpay/payment/manage/mappers/log/LogSettleMailMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 
 import java.util.Date;
@@ -14,11 +14,11 @@ import java.util.List;
 @AutoMapper(tablename = "log_settle_send", pkName = "id")
 public interface LogSettleMailMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject clearingLog);
 
     List<JSONObject> findByDate(Date date);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject update);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/ManagerLoginLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -13,10 +13,10 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "log_manager_login", pkName = "id")
 public interface ManagerLoginLogMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveLog(JSONObject log);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listAccountLoginLog(@Param("manager_id") String managerId, PageBounds pagination);
 
     PageList<JSONObject> listManagerLoginLog(JSONObject params, PageBounds pagination);

src/main/java/au/com/royalpay/payment/manage/mappers/log/NotifyErrorLogMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -18,14 +18,14 @@ import java.util.List;
 @AutoMapper(tablename = "log_notify_error", pkName = "id")
 public interface NotifyErrorLogMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void saveLog(JSONObject log);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "success=0 and `addtime`>addtime(now(),'-24:00:00')")
     List<JSONObject> listErrorLogsInOneHour();
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject notice);
 
     PageList<JSONObject> listErrorLogs(JSONObject params, PageBounds pageBounds);

src/main/java/au/com/royalpay/payment/manage/mappers/log/PlatformSettlementMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -15,19 +15,19 @@ import java.util.List;
 @AutoMapper(tablename = "log_clearing_platform_analysis", pkName = "log_id")
 public interface PlatformSettlementMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject params);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject params);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findBySettleDate(@Param("settle_date") Date settle_date, @Param("channel") String channel);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByDateMerchant(@Param("settle_date") String settle_date, @Param("channel") String channel, @Param("merchants") String merchants);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findByDate(@Param("settle_date") String settle_date);
 
     PageList<JSONObject> findSettleLogsAllMerchant(@Param("channel") String channel, PageBounds pageBounds);
@@ -38,6 +38,6 @@ public interface PlatformSettlementMapper {
 
     BigDecimal calculateRmbCharge(@Param("start_date") String start_date, @Param("end_date") String end_date, @Param("channel") String channel,@Param("ali_rate") BigDecimal ali_rate);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void delete(JSONObject params);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/PreSettleTaskMapper.java

@@ -1,6 +1,6 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
 import org.apache.ibatis.annotations.Param;
 
 /**

src/main/java/au/com/royalpay/payment/manage/mappers/log/StatisticsBDSalesReportMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,7 +15,7 @@ import java.util.List;
 @AutoMapper(tablename = "statistics_bd_sales", pkName = "log_id")
 public interface StatisticsBDSalesReportMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject report);
 
     List<JSONObject> getBDSaleList(JSONObject params);
@@ -24,6 +24,6 @@ public interface StatisticsBDSalesReportMapper {
 
     JSONObject findByBDIdAndLogDate(@Param("org_id") String org_id,@Param("bd_id") String bd_id, @Param("log_date")Date beginTime,@Param("isOrg") int isOrg);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject existBDSalesReport);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/log/ValidationLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
@@ -16,7 +16,7 @@ import java.util.List;
 @AutoMapper(tablename = "log_order_validation", pkName = "valid_id", keyGenerator = Jdbc3KeyGenerator.class)
 public interface ValidationLogMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject valid);
 
     void removeByDate(@Param("valid_date") Date validDate);

src/main/java/au/com/royalpay/payment/manage/mappers/log/WechatTemplateMsgSendLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import org.apache.ibatis.annotations.Param;
@@ -14,13 +14,13 @@ import java.util.List;
  */
 @AutoMapper(tablename = "log_wechat_template_msg", pkName = "send_id")
 public interface WechatTemplateMsgSendLogMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject log);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateStatus(@Param("send_id") String id, @Param("status") int status);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateLog(@Param("send_id") String id, @Param("status") int status, @Param("remark") String remark);
 
     List<JSONObject> listWechatMsg(JSONObject params, PageBounds pageBounds);

src/main/java/au/com/royalpay/payment/manage/mappers/log/WeekReportMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.log;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,12 +11,12 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "log_week_report", pkName = "report_id")
 public interface WeekReportMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject report);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findOne(@Param("report_id") String reportId);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void delete(@Param("report_id") String reportId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/notice/ActPartnerReadMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.notice;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,12 +12,12 @@ import org.apache.ibatis.annotations.Param;
  */
 @AutoMapper(tablename = "sys_act_client_display", pkName = "display_client_id")
 public interface ActPartnerReadMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject displayInfo);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject displayInfo);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject displayInfo(@Param("act_id") String actId, @Param("client_id") int clientId, @Param("account_id") String accountId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticeManageMapper.java

@@ -8,22 +8,22 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yishuqian on 10/10/2016.
  */
 @AutoMapper(tablename = "sys_notice", pkName = "notice_id")
 public interface NoticeManageMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listPageNotices(JSONObject params, PageBounds pagination);
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject getNoticeDetailById(String noticeId);
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void createNotice(JSONObject notice);
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void updateNotice(JSONObject notice);
 
     JSONObject getLatestWindowNotice(@Param("client_id") int client_id,@Param("end_time")Date end_time);

src/main/java/au/com/royalpay/payment/manage/mappers/notice/NoticePartnerMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.notice;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -15,21 +15,21 @@ import java.util.List;
  */
 @AutoMapper(tablename = "sys_notice_client", pkName = "notice_client_id")
 public interface NoticePartnerMapper{
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject noticePartner);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject noticePartner);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listNoticePartner(JSONObject noticePartner);
 
     PageList<JSONObject> listNoticesByClientId(JSONObject params, PageBounds pagination);
 
-    @AutoSql(type = SqlType.COUNT)
+    @AutoSql(SqlType.COUNT)
     int countNoticePartner(JSONObject params);
 
-    @AutoSql(type = SqlType.COUNT)
+    @AutoSql(SqlType.COUNT)
     int countClientsByNoticeId(JSONObject params);
 
     PageList<JSONObject> listClientsByNoticeId(JSONObject params, PageBounds pagination);

src/main/java/au/com/royalpay/payment/manage/mappers/ofei/TopUpOrderMapper.java

@@ -8,22 +8,22 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2016-06-25.
  */
 @AutoMapper(tablename = "top_up_order", pkName = "id")
 public interface TopUpOrderMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject order);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject order);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findById(@Param("id") String id);
 
     List<String> findOrderIdByStatus(@Param("status") String status);

src/main/java/au/com/royalpay/payment/manage/mappers/payment/AustracDataMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,15 +15,15 @@ import java.util.List;
  */
 @AutoMapper(tablename = "austrac_data", pkName = "id")
 public interface AustracDataMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> getTransactionTotal(JSONObject params);
 
-    @AutoSql(type = SqlType.DELETE)
+    @AutoSql(SqlType.DELETE)
     void delete(@Param("client_id") int client_id, @Param("clearing_time") Date clearing_time);
 
     BigDecimal getClientLastTransactionTotal(@Param("client_id") int client_id, @Param("clearing_time") Date clearing_time);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject data);
 
     List<JSONObject> getAustracData(JSONObject params);

src/main/java/au/com/royalpay/payment/manage/mappers/payment/CommonSubMerchantIdMapper.java

@@ -1,32 +1,32 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
 import org.apache.ibatis.annotations.Param;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Create by yixian at 2017-12-05 23:13
  */
 @AutoMapper(tablename = "pmt_sub_merchant_id", pkName = "sub_merchant_id")
 public interface CommonSubMerchantIdMapper {
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> list(@Param("is_valid") boolean is_valid, @Param("sub_merchant_id") String sub_merchant_id,PageBounds pageBounds);
 
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject record);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject record);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "is_valid = 1")
     JSONObject find(@Param("sub_merchant_id") String subMerchantId);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -16,16 +16,16 @@ import java.util.List;
  */
 @AutoMapper(tablename = "pmt_orders", pkName = "order_id")
 public interface OrderMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject order);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject order);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject find(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> listOrdersByMerchantOrderId(@Param("client_id") int clientId, @Param("client_order_id") String clientOrderId, PageBounds pagination);
 
     PageList<JSONObject> listOrders(JSONObject params, PageBounds pagination);
@@ -42,14 +42,14 @@ public interface OrderMapper {
 
     JSONObject getOrderDetail(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> list(JSONObject params, PageBounds pagination);
 
     void updateRefundAmount(@Param("order_id") String orderId);
 
     List<JSONObject> listOrdersWithNoTransactions();
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void setOrderErrorInfo(@Param("order_id") String orderId, @Param("error_code") String errCode, @Param("error_message") String errMsg);
 
     void updateOrderCreationError(@Param("order_id") String orderId, @Param("status") int status, @Param("error_code") String errorCode, @Param("error_message") String errorMessage);
@@ -70,7 +70,7 @@ public interface OrderMapper {
 
     List<JSONObject> listHalloweenActOrder(JSONObject param);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "status in (5,6,7) AND channel in('Wechat','Alipay')")
     List<JSONObject> listNewYearOrdersByOpenId(@Param("customer_id") String open_id,@Param("transaction_date") String date);
 

src/main/java/au/com/royalpay/payment/manage/mappers/payment/PaySuccessCountMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,6 +16,6 @@ import java.util.List;
 @AutoMapper(tablename = "paysuccess_count", pkName = "id")
 public interface PaySuccessCountMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     List<JSONObject> findCount(@Param("in_time") String time);
 }

src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundAuditionMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,17 +14,17 @@ import java.util.List;
  */
 @AutoMapper(tablename = "pmt_refund_applies", pkName = "id")
 public interface RefundAuditionMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject apply);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject apply);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "audit_result is null")
     List<JSONObject> listAuditingRefundsOfOrder(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject find(@Param("id") String refundAuditId);
 
     List<JSONObject> listAuditingRefundsOfClient(@Param("client_id") int clientId);

src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundMapper.java

@@ -10,42 +10,42 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 
 /**
  * Created by yixian on 2016-06-25.
  */
 @AutoMapper(tablename = "pmt_refunds", pkName = "refund_id")
 public interface RefundMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject refundOrder);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject refundOrder);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject find(@Param("refund_id") String refundOrderId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByClientRefundId(@Param("client_refund_id") String clientRefundId);
 
     List<JSONObject> listOrderRefunds(@Param("order_id") String orderId, PageBounds pagination);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "status=2")
     List<JSONObject> listUnConfirmedRefunds();
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "status=4 and confirm_time is not null")
     List<JSONObject> listConfirmedRefunds();
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByOutRefundId(@Param("out_refund_id") String outRefundNo);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "status=4 and confirm_time is not null and refund_id not in (select refund_id from pmt_transactions where refund_id is not null)")
     List<JSONObject> listConfirmedRefundsWithNoTransactions();
 

src/main/java/au/com/royalpay/payment/manage/mappers/payment/RefundReviewMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -15,19 +15,19 @@ import org.apache.ibatis.annotations.Param;
 @AutoMapper(tablename = "pmt_refunds_review", pkName = "review_id")
 public interface RefundReviewMapper {
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject review);
 
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "status=0 and is_valid=1")
     JSONObject findUnResolveByOrderId(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "status=0 and is_valid=1")
     JSONObject findUnResolveByReviewId(@Param("review_id") String reviewId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     JSONObject findByReviewId(@Param("review_id") String reviewId);
 
     PageList<JSONObject> listNeedReviewOrders(JSONObject reviewBean, PageBounds page);

src/main/java/au/com/royalpay/payment/manage/mappers/payment/TaskManualSettleMapper.java

@@ -1,9 +1,9 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -17,18 +17,18 @@ import java.util.List;
 @AutoMapper(tablename = "task_client_manual_settle", pkName = "task_id")
 public interface TaskManualSettleMapper {
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "request_time>curdate()")
     JSONObject findTodayTask(@Param("client_id") int clientId);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "clearing_order is null or disable_flag=1")
     List<JSONObject> listActiveTasks(@Param("client_id") int clientId);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject task);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject task);
 
     PageList<JSONObject> getEveryLatestRecord(PageBounds pagination);

src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java

@@ -1,10 +1,10 @@
 package au.com.royalpay.payment.manage.mappers.payment;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AdvanceSelect;
+import com.yixsoft.support.mybatis.autosql.annotations.AdvanceSelect;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
-import cn.yixblog.support.mybatis.paginator.annotations.CountRef;
+import com.yixsoft.support.mybatis.paginator.annotations.CountRef;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -20,7 +20,7 @@ import java.util.List;
  */
 @AutoMapper(tablename = "pmt_transactions", pkName = "transaction_id", keyGenerator = Jdbc3KeyGenerator.class)
 public interface TransactionMapper {
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject transaction);
 
     @CountRef(".countTransFlowPage")
@@ -34,11 +34,11 @@ public interface TransactionMapper {
 
     Double analysisBalance(JSONObject params);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "transaction_type = 'Credit'")
     JSONObject findByOrderId(@Param("order_id") String orderId);
 
-    @AutoSql(type = SqlType.UPDATE)
+    @AutoSql(SqlType.UPDATE)
     void update(JSONObject transaction);
 
     JSONObject findLastIncome();
@@ -108,7 +108,7 @@ public interface TransactionMapper {
 
     BigDecimal checkBalance(@Param("end") Date endDate);
 
-    @AutoSql(type = SqlType.COUNT)
+    @AutoSql(SqlType.COUNT)
     @AdvanceSelect(addonWhereClause = "transaction_type='Credit'")
     int countOrders(@Param("client_id") int clientId);
 
@@ -116,7 +116,7 @@ public interface TransactionMapper {
 
     JSONObject analysisRetailDailyReport(@Param("from") Date from, @Param("to") Date to, @Param("dev_id") String devId, @Param("client_id") int clientId, @Param("client_ids") String[] client_ids);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     @AdvanceSelect(addonWhereClause = "system_generate=1")
     List<JSONObject> findTransactionsBySysGen(@Param("order_id") String orderId);
 
@@ -145,7 +145,7 @@ public interface TransactionMapper {
      * @param systemTransactionId
      * @return
      */
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> findByClientIdAndSystemTransactionId(@Param("client_id") int clientId,
                                                               @Param("system_transaction_id") String systemTransactionId,
                                                               PageBounds pageBounds);

src/main/java/au/com/royalpay/payment/manage/mappers/preapply/PreApplyHandleLogMapper.java

@@ -1,8 +1,8 @@
 package au.com.royalpay.payment.manage.mappers.preapply;
 
-import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoMapper;
-import cn.yixblog.support.mybatis.autosql.annotations.AutoSql;
+import com.yixsoft.support.mybatis.autosql.annotations.AutoSql;
-import cn.yixblog.support.mybatis.autosql.annotations.SqlType;
+import com.yixsoft.support.mybatis.autosql.annotations.SqlType;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
@@ -12,12 +12,12 @@ import java.util.List;
 
 @AutoMapper(tablename = "pre_apply_handle_log", pkName = "id")
 public interface PreApplyHandleLogMapper {
-   @AutoSql(type = SqlType.UPDATE)
+   @AutoSql(SqlType.UPDATE)
    void update(JSONObject data);
 
-    @AutoSql(type = SqlType.INSERT)
+    @AutoSql(SqlType.INSERT)
     void save(JSONObject data);
 
-    @AutoSql(type = SqlType.SELECT)
+    @AutoSql(SqlType.SELECT)
     PageList<JSONObject> listHandleLogs(JSONObject params, PageBounds pagination);
 }