Merge branch 'develop' into develop-kjf-dev

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/amqp/rabbit/RabbitGdActQueueMQ.java

@@ -117,6 +117,11 @@ public class RabbitGdActQueueMQ extends AbstractMQ {
          */
         private String iccId;
 
+        /**
+         *  SN
+         */
+        private String posSn;
+
     }
 
     @Override

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/mq/RabbitKxsOrderQueueListener.java

@@ -40,9 +40,8 @@ public class RabbitKxsOrderQueueListener {
 	@RabbitListener(queues = RabbitKxsOrderQueueMQ.QUEUE_NAME, ackMode = "MANUAL")
 	@RabbitHandler
 	public void onMessage(String msg, Message message, Channel channel){
-		log.info("收到客小爽订单消息: " + msg);
-		log.info("收到客小爽订单消息: " + RabbitKxsOrderQueueMQ.parse(msg));
         try {
+			log.info("收到客小爽订单消息: " + RabbitKxsOrderQueueMQ.parse(msg));
 			RabbitKxsOrderQueueMQ.MsgEntity parse = RabbitKxsOrderQueueMQ.parse(msg);
 			//处理百城千团订单，创建活动
 			if(parse.getProductId() == 100 && parse.getStatus() == 2){
@@ -54,7 +53,7 @@ public class RabbitKxsOrderQueueListener {
 
 			channel.basicAck(message.getMessageProperties().getDeliveryTag(),false);
         } catch (Exception e) {
-			log.error("客小爽订单消息消费失败:{}", JSON.toJSONString(msg), e);
+			log.error("客小爽订单消息消费失败:{}", msg, e);
 			try {
 				channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
 			} catch (IOException ex) {

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdServiceImpl.java

@@ -58,20 +58,22 @@ public class KxsGdServiceImpl implements KxsGdService {
                     if ("已激活".equals(gdQueryOrder.getActivationStatusName())) {
                         KxsGdReport kxsGdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
                                 .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
-                                .eq(KxsGdReport::getGdSn, gdQueryOrder.getIccId())
+//                                .eq(KxsGdReport::getGdSn, gdQueryOrder.getIccId())
                                 .eq(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
-                        if (kxsGdReport != null) {
-                            //发送广电激活MQ消息
-                            RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();
-                            BeanUtil.copyProperties(gdQueryOrder, msgEntity);
-                            mqSender.send(RabbitGdActQueueMQ.build(msgEntity));
-
-                            kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
-                                    .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
-                                    .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
-                            log.info("发送广电激活数据{}", kxsGdReport.getGdSn()
-                                    + "," + kxsGdReport.getGdMobile());
+                        if (kxsGdReport == null) {
+                            continue;
                         }
+                        //发送广电激活MQ消息
+                        RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();
+                        BeanUtil.copyProperties(gdQueryOrder, msgEntity);
+                        msgEntity.setPosSn(kxsGdReport.getGdSn());
+                        mqSender.send(RabbitGdActQueueMQ.build(msgEntity));
+
+                        kxsGdReportMapper.update(null, Wrappers.<KxsGdReport>lambdaUpdate().eq(KxsGdReport::getId, kxsGdReport.getId())
+                                .set(KxsGdReport::getIsCheck, GdReportEnum.CHECK_SUC.getType())
+                                .set(KxsGdReport::getGdMobile, gdQueryOrder.getPhoneNo()));
+                        log.info("发送广电激活数据{}", kxsGdReport.getGdSn()
+                                + "," + kxsGdReport.getGdMobile());
                     }
                 }
                 pageNo++;

kxs-transfer/src/main/java/com/kxs/transfer/api/service/user/impl/KxsPartnerServiceImpl.java

@@ -138,6 +138,10 @@ public class KxsPartnerServiceImpl extends ServiceImpl<KxsPartnerMapper, KxsPart
 
         //操作类型
         OperationType operation = dmlData.getOperation();
+        if(operation.equals(OperationType.DELETE)){
+            baseMapper.deleteById(id);
+            return;
+        }
         for (String field : changeFieldList) {
 
             switch (field) {

kxs-transfer/src/main/java/com/kxs/transfer/api/task/taskJob.java

@@ -81,7 +81,7 @@ public class taskJob {
     @Scheduled(fixedDelay = 1000 * 60 * 5)
 //    @Scheduled(fixedDelay = 1000 * 5)
     public void tradeRepeatEntry(){
-        List<KxsDtsErrorLog> list = kxsDtsErrorLogService.list(Wrappers.<KxsDtsErrorLog>lambdaQuery().eq(KxsDtsErrorLog::getOperation, OperationType.INSERT).last("limit 100"));
+        List<KxsDtsErrorLog> list = kxsDtsErrorLogService.list(Wrappers.<KxsDtsErrorLog>lambdaQuery().in(KxsDtsErrorLog::getOperation, OperationType.INSERT, OperationType.DELETE).last("limit 100"));
 
         for (KxsDtsErrorLog kxsDtsErrorLog : list) {
             try {
@@ -109,7 +109,10 @@ public class taskJob {
                     //删除本条记录
                     kxsDtsErrorLogService.removeById(kxsDtsErrorLog.getId());
                 }
-
+                //合伙人账户余额变动记录表
+                if ("AmountRecordNew".equals(kxsDtsErrorLog.getTableName()) ) {
+                    kxsPartnerService.changeAccountLogData(JSON.parseObject(kxsDtsErrorLog.getContent(), DMLData.class));
+                }