Merge branch 'test' into dev-lms

share-common/src/main/java/share/common/constant/Constants.java

@@ -20,7 +20,7 @@ public class Constants
 
     public final static Integer ROMM_LOCK_LAZY_MINUTE = 0;
 
-    public static final String CONFIG_KEY_SITE_URL = "https://www.coujio.com"; //域名
+    public static final String CONFIG_KEY_SITE_URL = "https://coujiao.pseer.com"; //域名
     public static final String CONFIG_KEY_API_URL = "https://www.coujio.com"; //admin接口地址
     // 订单取消Key
     public static final String ORDER_AUTO_CANCEL_KEY = "order_auto_cancel_key";

share-system/src/main/java/share/system/domain/vo/SRoomVo.java

@@ -119,6 +119,11 @@ public class SRoomVo extends BaseEntity
     private Long recordsId;
 
     /**
+     * 保洁人员id
+     */
+    private Long recordsUserId;
+
+    /**
      * 是否脏房
      */
     private Integer isDirtyRoom;

share-system/src/main/java/share/system/service/impl/OrderPayServiceImpl.java

@@ -143,7 +143,7 @@ public class OrderPayServiceImpl implements OrderPayService {
      */
     private CreateOrderRequestVo getUnifiedorderVo(SOrder sOrder, String openid, String appId, String mchId, String signKey) {
         // 获取域名
-        String apiDomain = Constants.CONFIG_KEY_API_URL;
+        String apiDomain = Constants.CONFIG_KEY_SITE_URL;
         AttachVo attachVo = new AttachVo(OrderTypeEnum.getEnumByCode(sOrder.getOrderType()).getValue(), sOrder.getConsumerId());
 
         CreateOrderRequestVo vo = new CreateOrderRequestVo();
@@ -205,7 +205,7 @@ public class OrderPayServiceImpl implements OrderPayService {
      */
     private SaobeiMiniPayRequestVo getSaobeiUnifiedOrderVo(SOrder sOrder, String openid, String appId, String mchId, String signKey) {
         // 获取域名
-        String apiDomain = Constants.CONFIG_KEY_API_URL;
+        String apiDomain = Constants.CONFIG_KEY_SITE_URL;
         AttachVo attachVo = new AttachVo(OrderTypeEnum.getEnumByCode(sOrder.getOrderType()).getValue(), sOrder.getConsumerId());
 
         SaobeiMiniPayRequestVo vo = new SaobeiMiniPayRequestVo();

share-system/src/main/java/share/system/service/impl/OrderRefundServiceImpl.java

@@ -77,8 +77,8 @@ public class OrderRefundServiceImpl extends ServiceImpl<SOrderMapper, SOrder> im
         String appId = weChatConfig.getAppId();
         String mchId = weChatConfig.getMchId();
         String signKey = weChatConfig.getSignKey();
-        String path = weChatConfig.getCertPath(); //TODO 商户证书路径p12(待提供）
-        String apiDomain = Constants.CONFIG_KEY_API_URL;
+        String path = weChatConfig.getCertPath();
+        String apiDomain = Constants.CONFIG_KEY_SITE_URL;
         //统一下单数据
         WxRefundVo wxRefundVo = new WxRefundVo();
         wxRefundVo.setAppid(appId);

share-system/src/main/java/share/system/service/impl/SStoreServiceImpl.java

@@ -126,7 +126,7 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
                     sCouponList.stream().forEach(item1 -> {
                         if (item.getDealgroupId().equals(item1.getDealgroupId())) {
                             if (StringUtils.isNotEmpty(item.getStoreIds())) {
-                                if (item1.getStoreIds().contains(item.getStoreIds())) {
+                                if (item1.getStoreIds().equals(item.getStoreIds())) {
                                     return;
                                 } else {
                                     SCoupon sCoupon = new SCoupon();
@@ -404,6 +404,7 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
                             SCleanRecords records = recordsMap.get(room.getId()).get(0);
                             room.setRecordsStatus(records.getStatus());
                             room.setRecordsId(records.getId());
+                            room.setRecordsUserId(records.getConsumerId());
                         }
 
                     }