Merge branch 'hotfix02180109compile_err' into develop

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

@@ -435,7 +435,7 @@ public class RetailAppServiceImp implements RetailAppService {
 
     @Override
     public void updateDevToken(JSONObject device, String devToken) {
-        deviceSupport.updateIphoneMessageToken(device, devToken);
+        deviceSupport.updateDeviceMessageToken(device, devToken);
     }
 
     @Override

src/main/java/au/com/royalpay/payment/manage/apps/core/CustomerImpressionService.java

@@ -7,7 +7,7 @@ import com.alibaba.fastjson.JSONObject;
 /**
  * Created by wangning on 2017/12/28.
  */
-public interface CustomerImpression {
+public interface CustomerImpressionService {
 
     JSONObject listPageble(CustomerImpressionQuery customerImpressionQuery);
 

src/main/java/au/com/royalpay/payment/manage/apps/core/impls/CustomerImpressionServiceImpl.java

@@ -21,7 +21,7 @@ import com.github.miemiedev.mybatis.paginator.domain.PageList;
 import com.maxmind.geoip.LookupService;
 
 import au.com.royalpay.payment.manage.apps.bean.CustomerImpressionQuery;
-import au.com.royalpay.payment.manage.apps.core.CustomerImpression;
+import au.com.royalpay.payment.manage.apps.core.CustomerImpressionService;
 import au.com.royalpay.payment.manage.mappers.client.ClientCustomersMapper;
 import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
@@ -32,7 +32,7 @@ import au.com.royalpay.payment.tools.utils.PageListUtils;
  * Created by wangning on 2017/12/28.
  */
 @Service
-public class CustomerImpressionImpl implements CustomerImpression {
+public class CustomerImpressionServiceImpl implements CustomerImpressionService {
     @Resource
     private ClientCustomersMapper clientCustomersMapper;
     @Resource
@@ -90,7 +90,7 @@ public class CustomerImpressionImpl implements CustomerImpression {
     public void generate(int client_id) {
         JSONObject params = new JSONObject();
         params.put("client_id", client_id);
-        params.put("include_success_status",4);
+        params.put("include_success_status",3);
         PageList<JSONObject> lastRecord = clientCustomersMapper.listCustomerInfo(params, new PageBounds(1, 1, Order.formString("update_time.desc")));
         if (!CollectionUtils.isEmpty(lastRecord)) {
             params.put("confirm_time", lastRecord.get(0).getDate("update_time"));

src/main/java/au/com/royalpay/payment/manage/apps/web/CustomerImpressionController.java

@@ -1,7 +1,7 @@
 package au.com.royalpay.payment.manage.apps.web;
 
 import au.com.royalpay.payment.manage.apps.bean.CustomerImpressionQuery;
-import au.com.royalpay.payment.manage.apps.core.CustomerImpression;
+import au.com.royalpay.payment.manage.apps.core.CustomerImpressionService;
 import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.device.advise.AppClientController;
 
@@ -20,25 +20,31 @@ import javax.annotation.Resource;
 @RequestMapping(value = "/customers/impression")
 public class CustomerImpressionController {
     @Resource
-    private CustomerImpression customerImpression;
+    private CustomerImpressionService customerImpressionService;
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
-    public JSONObject list(CustomerImpressionQuery customerImpressionQuery,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
+    public JSONObject list(CustomerImpressionQuery customerImpressionQuery, @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
         customerImpressionQuery.setClient_id(app.getInteger("client_id"));
-        return customerImpression.listPageble(customerImpressionQuery);
+        return customerImpressionService.listPageble(customerImpressionQuery);
     }
 
-
     @RequestMapping(value = "/{customer_id}", method = RequestMethod.GET)
     @ResponseBody
-    public JSONObject find(@PathVariable String customer_id,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
+    public JSONObject find(@PathVariable String customer_id, @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
-        return customerImpression.findOne(app.getIntValue("client_id"),customer_id);
+        return customerImpressionService.findOne(app.getIntValue("client_id"), customer_id);
     }
 
     @RequestMapping(value = "/{customer_id}", method = RequestMethod.PUT)
     @ResponseBody
-    public void modifyNameRemark(@PathVariable String customer_id, @RequestBody JSONObject customerInfo,@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
+    public void modifyNameRemark(@PathVariable String customer_id, @RequestBody JSONObject customerInfo,
-         customerImpression.modifyNameRemark(app.getIntValue("client_id"),customer_id,customerInfo.getString("name_remark"));
+            @ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
+        customerImpressionService.modifyNameRemark(app.getIntValue("client_id"), customer_id, customerInfo.getString("name_remark"));
+    }
+
+    @RequestMapping(value = "/gengrate", method = RequestMethod.PUT)
+    @ResponseBody
+    public void generate(@ModelAttribute(CommonConsts.RETAIL_DEVICE) JSONObject app) {
+        customerImpressionService.generate(app.getIntValue("client_id"));
     }
 }

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

@@ -314,6 +314,7 @@ public class TestController implements ApplicationEventPublisherAware {
                 elem = alipayClient.onlineRefund(refundOrder, type == TradeType.GATEWAY_H5);
                 xmlStr = XmlFormatUtils.formatXml(elem);
                 res.put("xml", xmlStr);
+                break;
             default:
                 throw new BadRequestException("Not Support channel:" + channel);
         }

src/main/resources/application.properties

@@ -85,6 +85,8 @@ app.mail.host=https://mailsupport.royalpay.com.au
 mail.send.credentialCode=Fd1aRfdjc9
 
 apple.message.apns.password=F1b5*ChJPp73
+android.message.secret=2b96d9bc6169c9554218aab1
+android.message.appkey=3f33a10d0a7d4ac94d8f2431
 
 spring.thymeleaf.mode=LEGACYHTML5
 

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

@@ -552,7 +552,7 @@
       from pmt_orders  o
             left join sys_customer_relation cr on  cr.wepay_openid = o.customer_id
             left join sys_customer_relation_alipay cra on cra.alipay_uid = o.customer_id
-            where o.customer_id is not null and (o.channel = 'Alipay' or o.channel = 'Wechat')
+            where o.customer_id is not null and o.channel is not null
             and client_id = #{client_id}
             <if test="confirm_time">
              and   o.confirm_time > #{confirm_time}

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

@@ -0,0 +1,27 @@
+package au.com.royalpay.payment.manage.apps.core.impls;
+
+import au.com.royalpay.payment.manage.apps.core.CustomerImpressionService;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+
+/**
+ * Created by wangning on 08/01/2018.
+ */
+@SpringBootTest
+@ActiveProfiles({"local","alipay","wechat","jd","bestpay"})
+@RunWith(SpringRunner.class)
+public class CustomerImpressionServiceImplTest {
+    @Resource
+    private CustomerImpressionService customerImpressionService;
+    @Test
+    public void generate() throws Exception {
+        customerImpressionService.generate(9);
+    }
+
+}