Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppShareholderDetailChangeRecordBiz.java

@@ -41,13 +41,13 @@ public class AppShareholderDetailChangeRecordBiz extends BaseBiz<AppShareholderD
      * 查询员工信息变更记录表
      */
     public List<AppShareholderDetailChangeRecord> findShareholderChangeRecord(AppShareholderDetail appShareholderDetail) {
-        Example example = new Example(AppShareholderDetailChangeRecord.class);
+      /*  Example example = new Example(AppShareholderDetailChangeRecord.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("userId", appShareholderDetail.getId());
         if (appShareholderDetail.getPhone() != null) {
             criteria.andEqualTo("phone", appShareholderDetail.getPhone());
-        }
-        List<AppShareholderDetailChangeRecord > list = mapper.selectByExample(example);
+        }*/
+        List<AppShareholderDetailChangeRecord> list = mapper.selectAppshareholderUserOrPhoneOrUserId(appShareholderDetail.getId(), appShareholderDetail.getPhone());
         return list;
     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppShareholderDetailChangeRecordMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface AppShareholderDetailChangeRecordMapper extends Mapper<AppShareholderDetailChangeRecord> {
+    List<AppShareholderDetailChangeRecord> selectAppshareholderUserOrPhoneOrUserId(@Param("userId") Integer userId, @Param("phone") String phone);
+
 }

ace-modules/ace-admin/src/main/resources/mapper/AppShareholderDetailChangeRecord.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.github.wxiaoqi.security.admin.mapper.AppShareholderDetailChangeRecordMapper">
-    <resultMap id="appShareholderDetailMap" type="com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord">
+    <resultMap id="appShareholderDetailMap"
+               type="com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord">
         <result property="id" column="id"/>
         <result property="companyName" column="company_name"/>
         <result property="userId" column="user_id"/>
@@ -13,6 +14,20 @@
         <result property="relTime" column="rel_time"/>
     </resultMap>
 
+    <select id="selectAppshareholderUserOrPhoneOrUserId"
+            resultType="com.github.wxiaoqi.security.admin.entity.AppShareholderDetailChangeRecord">
+        SELECT *from
+        app_shareholder_detail_change_record
+        WHERE
+        1=1
+        <if test="userId!=null">
+            and user_id=#{userId}
+        </if>
+        <if test="phone!=null">
+            or phone=#{phone}
+        </if>
+        ORDER BY crt_time DESC
+    </select>
 
 
 </mapper>

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderInvoice.java

@@ -100,14 +100,14 @@ public class OrderInvoice {
     /**
      * 创建者id
      */
-    @Column(name = "crt_user")
-    private Integer crtUser;
+    @Column(name = "user_id")
+    private Integer userId;
 
     /**
      * 更新者id
      */
-    @Column(name = "upd_user")
-    private Integer updUser;
+    @Column(name = "user_upd")
+    private Integer userUpd;
 
     /**
      * 更多内容

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderInvoiceBiz.java

@@ -60,7 +60,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 				//查询是否已开票
 				OrderInvoice oldValue = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderId)).getData();
 				if (oldValue == null) { //不存在就添加
-					orderInvoice.setCrtUser(appUserDTO.getUserid());
+					orderInvoice.setUserId(appUserDTO.getUserid());
 					insertSelectiveRe(orderInvoice);
 					log.info("添加发票记录成功: {}", orderInvoice);
 					OrderInvoice newValue = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderId)).getData();
@@ -96,7 +96,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 		Set<OrderInvoice> set = new HashSet<>();
 		String[] orderIdArray = orderIds.split(",");
 		if (orderIdArray.length > 0) {
-			for (int a = 0; a <= orderIdArray.length; a++) {
+			for (int a = 0; a <= orderIdArray.length -1; a++) {
 				OrderInvoice orderInvoice = selectByUserIdAndOrderId(appUserDTO.getUserid(), Integer.parseInt(orderIdArray[a])).getData();
 				if(orderInvoice != null) {
 					set.add(orderInvoice);
@@ -116,9 +116,10 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
 		}
 		Example example = new Example(OrderInvoice.class);
-		example.createCriteria().andEqualTo("crtUser", appUserDTO.getUserid());
+		Example.Criteria criteria = example.createCriteria();
+		criteria.andEqualTo("userId", appUserDTO.getUserid());
 		if (type != null) {
-			example.createCriteria().andEqualTo("type", type);
+			criteria.andEqualTo("type", type);
 		}
 		return ObjectRestResponse.succ(mapper.selectByExample(example));
 	}
@@ -130,9 +131,10 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 	 */
 	public ObjectRestResponse<List<OrderInvoice>> selectByUserId(Integer userId, Integer type) {
 		Example example = new Example(OrderInvoice.class);
-		example.createCriteria().andEqualTo("crtUser", userId);
+		Example.Criteria criteria = example.createCriteria();
+		criteria.andEqualTo("userId", userId);
 		if (type != null) {
-			example.createCriteria().andEqualTo("type", type);
+			criteria.andEqualTo("type", type);
 		}
 		return ObjectRestResponse.succ(mapper.selectByExample(example));
 	}
@@ -140,7 +142,7 @@ public class OrderInvoiceBiz extends BaseBiz<OrderInvoiceMapper, OrderInvoice> {
 	public ObjectRestResponse<OrderInvoice> selectByUserIdAndOrderId(Integer userId, Integer orderId) {
 
 		return ObjectRestResponse.succ(mapper.selectByUserIdAndOrderId(new OrderInvoice(){{
-			setCrtUser(userId);
+			setUserId(userId);
 			setOrderIds(orderId + "");
 		}}));
 	}

xx-order/xx-order-server/src/main/resources/mapper/OrderInvoiceMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.order.mapper.OrderInvoiceMapper" >
     <select id="selectByUserIdAndOrderId" parameterType="com.xxfc.platform.order.entity.OrderInvoice" resultType="com.xxfc.platform.order.entity.OrderInvoice">
-        select * from order_e_invoice where crt_user = #{crtUser} and order_ids like concat("%", #{orderIds}, "%")
+        select * from order_e_invoice where user_id = #{userId} and order_ids like concat("%", #{orderIds}, "%")
     </select>
 </mapper>
\ No newline at end of file

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/JPushBiz.java

@@ -12,6 +12,7 @@ import cn.jpush.api.push.model.Platform;
 import cn.jpush.api.push.model.PushPayload;
 import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.notification.AndroidNotification;
+import cn.jpush.api.push.model.notification.IosNotification;
 import cn.jpush.api.push.model.notification.Notification;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -178,7 +179,7 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
             String [] userIdList=userIds.split(",");
             audience=Audience.alias(userIdList);
         }else {
-            if (debug){
+            if (!debug){
                 String [] userIdList=userIds.split(",");
                 audience=Audience.alias(userIdList);
             }
@@ -187,7 +188,7 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
         if (StringUtils.isNotBlank(messagePush.getIntent())){
             intent= getJsonObject(messagePush.getIntent());
         }
-        Map<String, String> extras = new HashMap<String, String>();
+        Map<String, String> extras = new HashMap<>();
         extras.put("onclickType",messagePush.getJumpType()+"");
         if (StringUtils.isNotBlank(orderNo)){
         extras.put("orderNo",orderNo);
@@ -206,13 +207,20 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
                         .setIntent(intent)
                         .addExtras(extras)
                         .build())
+                .addPlatformNotification(IosNotification.newBuilder()
+                        .setAlert(messagePush.getAlert())
+                        .setBadge(1)
+                        .setSound("default")
+                        .setMutableContent(true)
+                        .addExtras(setExtras(extras,messagePush))
+                        .build())
                 .build();
         return PushPayload.newBuilder()
                 .setPlatform(Platform.all())
                 .setAudience(audience)
                 .setNotification(notification)
                 .setOptions(Options.newBuilder()
-                        .setApnsProduction(true)
+                        .setApnsProduction(debug)
                         .setSendno(ServiceHelper.generateSendno())
                         .build())
                 .build();
@@ -225,6 +233,21 @@ public class JPushBiz extends BaseBiz<MessagePushMapper, MessagePush> {
 
     }
 
+    public  Map<String, String>  setExtras(Map<String, String> extras,MessagePush messagePush){
+        Integer style=messagePush.getStyle();
+        switch (style){
+            case  1:
+                extras.put("push_title",messagePush.getTitle());
+            case  2:
+                extras.put("push_title",messagePush.getTitle());
+            case  3:
+                extras.put("push_title",messagePush.getTitle());
+                extras.put("big_pic_path",messagePush.getBigPicPath());
+        }
+
+        return extras;
+    }
+
     //编辑推送内容
     public  ObjectRestResponse updMessagePush(MessagePush messagePush){
        Integer id= messagePush.getId();