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

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -500,17 +500,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     }
                 }
 
-                log.info("getRefundPrice =" +item.getRefundPrice());
+                log.info("getRefundPrice =" + item.getRefundPrice());
                 if (refundingEntitiesCount > 0) { // 存在其他正在退款的该入场人订单
-                    log.info("111");
                     newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT2;
                 } else {
-                    log.info("222");
-                    if (item.getRefundPrice().compareTo(BigDecimal.ZERO) > 0) { // 已经有退完的 那就是部分退款了
-                        log.info("333");
+                    if (orderTicketVo.getPriceRefund().compareTo(BigDecimal.ZERO) > 0) { // 已经有退完的 那就是部分退款了
                         newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT4;
                     } else {
-                        log.info("444");
                         newIsPayment = KylinTableStatusConst.ENTITIES_IS_PAYMENT1;
                     }
                 }
@@ -518,6 +514,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 entitiesTable.setIsPayment(newIsPayment);
                 entitiesTable.setUpdatedAt(time);
 
+                log.info("sqlsDataB data = "+entitiesTable.getIsPayment());
+
                 sqlsDataB.add(new Object[]{
                         entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), now, now
                 });

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -34,7 +34,7 @@ kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,
 
 # ------------------------用户发起订单退款撤回----------------------------
 kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
 
 # ------------------------超时支付申请退款----------------------------

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -356,7 +356,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         }
         orderTickets.setPriceActual(orderTickets.getPriceTotal());
         orderTickets.setPriceVoucher(BigDecimal.valueOf(0.0));
-        orderTickets.setPriceExpress(ticketData.getPriceExpress());
+        orderTickets.setPriceExpress(payOrderParam.getIsExpress() == 1?ticketData.getPriceExpress():BigDecimal.valueOf(0));
         orderTickets.setPriceRefund(BigDecimal.valueOf(0.0));
         orderTickets.setRefundNumber(0);
         orderTickets.setPayType(payOrderParam.getPayType());

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -30,10 +30,10 @@ kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,orde
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 
-# ------------------------用户发起订单退款撤回----------------------------
-kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
+## ------------------------用户发起订单退款撤回----------------------------
+#kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+#kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+#kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
 
 # ------------------------超时支付申请退款----------------------------
 kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql

@@ -156,3 +156,28 @@ CREATE TABLE `sweet_manual_notify`
   DEFAULT CHARSET = utf8
   COLLATE = utf8_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT '电子宣传手册通知表';
+
+
+-- 电子宣传手册商铺表
+drop TABLE if exists `sweet_manual_shop`;
+CREATE TABLE `sweet_manual_shop`
+(
+    `mid`              bigint unsigned NOT NULL AUTO_INCREMENT,
+    `manual_shop_id` varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_shop_id',
+    `manual_id`          varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
+    `title`            varchar(200)    NOT NULL DEFAULT '' COMMENT '商家名称',
+    `pic_url`            varchar(200)    NOT NULL DEFAULT '' COMMENT '商家图片',
+    `describe`          longtext        NULL COMMENT '商家介绍',
+    `is_recommend`           tinyint         NOT NULL DEFAULT 1 COMMENT '0不推荐 1推荐',
+    `sort`           tinyint         NOT NULL DEFAULT 1 COMMENT '排序字段 数字越大越靠前',
+    `status`           tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
+    `created_at`       datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`       datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `manual_shop_index` (`manual_shop_id`),
+    KEY `manual_id_index` (`manual_id`),
+    KEY `status_index` (`status`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '电子宣传手册商铺表';
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetRichtextServiceImpl.java

@@ -42,6 +42,10 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S
     @Override
     public ResponseDto<Boolean> add(String manualId, String details, String local, String pirUrl, Integer type) {
         try {
+            int count = sweetRichtextMapper.selectCount(Wrappers.lambdaQuery(SweetRichtext.class).eq(SweetRichtext::getManualId, manualId).eq(SweetRichtext::getType, type));
+            if(count>0){
+                return ResponseDto.failure("不能重复添加");
+            }
             SweetRichtext sweetRichtext = SweetRichtext.getNew();
             sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
             sweetRichtext.setManualId(manualId);

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -39,10 +39,10 @@ kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,orde
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)
 
-# ------------------------用户发起订单退款撤回----------------------------
-kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
+## ------------------------用户发起订单退款撤回----------------------------
+#kylin_order_ticket_status.withDraw=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+#kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+#kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
 
 # ------------------------超时支付申请退款----------------------------
 kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

@@ -19,6 +19,7 @@ liquidnet:
     password: admin
   config:
     #    location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
+#    location: /Users/hujiachen/JavaProject/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
     location: /app/support-config
 # end-dev-这里是配置信息基本值