ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -310,20 +310,25 @@ wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum); wrapper2.last("limit 1"); AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper2); auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS); auctionSalesroomGoods.setStartTime(LocalDateTime.now()); this.updateById(auctionSalesroomGoods); if(auctionSalesroomGoods!=null){ auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS); auctionSalesroomGoods.setStartTime(LocalDateTime.now()); this.updateById(auctionSalesroomGoods); } Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM); map.put("auctionSalesroomId", auctionSalesroom.getId()); map.put("AuctionTypeEnum",auctionSalesroom.getStatus()); map.put("message_type", "start"); map.put("type", "1"); String msg = null; try { msg = objectMapper.writeValueAsString(map); } catch (JsonProcessingException e) { } WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.AUCTIONEER.getCode(), msg); WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.MEMBER.getCode(), msg); } @@ -378,14 +383,16 @@ Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM); map.put("AuctionTypeEnum",auctionSalesroom.getStatus()); map.put("auctionSalesroomId", auctionSalesroom.getId()); map.put("message_type", "end"); map.put("type", "1"); String msg = null; try { msg = objectMapper.writeValueAsString(map); } catch (JsonProcessingException e) { } WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.AUCTIONEER.getCode(), msg); WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.MEMBER.getCode(), msg); } @@ -418,18 +425,20 @@ auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS); this.updateById(auctionSalesroomGoods); /* Map<String, Object> map = new ConcurrentHashMap<>(); Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM_GOODS); map.put("notification_time", LocalDateTime.now()); map.put("goodsSkuId", auctionSalesroomGoods.getId()); map.put("message_type", "start"); map.put("type",2); map.put("AuctionGoodsStatusEnum",auctionSalesroomGoods.getStatus()); String msg = null; try { msg = objectMapper.writeValueAsString(map); } catch (JsonProcessingException e) { throw new RuntimeException(e); } WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.AUCTIONEER.getCode(), msg);*/ WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.MEMBER.getCode(), msg); } @@ -486,18 +495,20 @@ auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.ENDED); this.updateById(auctionSalesroomGoods); /* Map<String, Object> map = new ConcurrentHashMap<>(); Map<String, Object> map = new ConcurrentHashMap<>(); map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM_GOODS); map.put("notification_time", LocalDateTime.now()); map.put("goodsSkuId", auctionSalesroomGoods.getId()); map.put("message_type", "end"); map.put("type",2); map.put("AuctionGoodsStatusEnum",auctionSalesroomGoods.getStatus()); String msg = null; try { msg = objectMapper.writeValueAsString(map); } catch (JsonProcessingException e) { throw new RuntimeException(e); } WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.AUCTIONEER.getCode(), msg);*/ WebSocketUsers.sendMessageToUsersByType(ClientTypeEnum.MEMBER.getCode(), msg); }
@@ -243,9 +243,9 @@ if (sysUser==null){ throw new ServiceException("手机号未注册"); } if (!SecurityUtils.matchesPassword(arepartAuctionBidRecordDTO.getPassword(), sysUser.getPassword())){ /* if (!SecurityUtils.matchesPassword(arepartAuctionBidRecordDTO.getPassword(), sysUser.getPassword())){ throw new ServiceException("密码输入错误"); } }*/ LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery(); wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,arepartAuctionBidRecordDTO.getAuctionSalesroomQrcode()); @@ -644,7 +644,8 @@ map.put("auctionSalesroomId", bidVO.getAuctionSalesroomId()); map.put("byId", byId.getStatus()); map.put("lastBidAmount",one2.getLastBidAmount()); map.put("message_type", "start"); map.put("message_type", "BidRecor"); map.put("type",3); String msg = null; try { msg = objectMapper.writeValueAsString(map); @@ -712,7 +713,8 @@ map.put("auctionSalesroomId", bidVO.getAuctionSalesroomId()); map.put("byId", byId.getStartStatus()); map.put("lastBidAmount",one2.getLastBidAmount()); map.put("message_type", "start"); map.put("message_type", "BidRecor"); map.put("type",4); String msg = null; try { msg = objectMapper.writeValueAsString(map); ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -432,7 +432,7 @@ String plainData = null; if (isDataEncrypted) { try { plainData = AlipayEncrypt.decryptContent(content, encryptType, "VSpPcLQjLSoTz6Yd7KNoyQ==", charset); plainData = AlipayEncrypt.decryptContent(content, encryptType, "XABBSOeWDakvuG9TDez4Qg====", charset); } catch (AlipayApiException e) { //解密异常, 记录日志 e.getMessage(); ruoyi-modules/ruoyi-order/src/main/resources/conf/param.properties
@@ -13,7 +13,7 @@ ali_public_key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlW2RMACojdqTa8H+j6411Lm5UipGXXbQiswq50rUflwjTj843zNVaVpk8uJmbdmtUBJlmblgBS/a31O4L4LrHB8WxJ+w0f9DBNTq9T6b80MiAVnU/3gXK365DmbzPWS5pR9wEgJVHnfOFUbsB5AVFHV0m9hUZcPv7xveuEp3BEoD5smaDJByR+KgFw0Q0JgINhhE6bsEa3UgJ198af269LtQ5HJl1TWLI8aeqW14HrxyADIt49NB9KZ8MOdKP+66HWcrXlipKFHtccy3dff72DqPmFdESoXfLXKZyhU5w9v4Q5F6UoAGTPwl9KQwikTobNeJ/7su7X3AB6+C14J4sQIDAQAB # 支付宝回调地址 notify_url = http://116.63.172.131:8088/order/forepart/paylog/alipay/notify notify_url = http://10.136.177.152:9000/order/forepart/paylog/alipay/notify # 签约的appid app_id = 2021004150664294 @@ -24,22 +24,22 @@ # 微信开发平台（应用APPID） #以前的wx74f8aea529dc99d7 appID = wxe91f1af7638aa5dd appID = wx69e3ac6e13a889b7 # 微信支付分配的商户号ID（微信支付商户号） mchID = 1678345627 mchID = 1220540001 # 小程序的商户号 XmchID = 1678345627 XmchID = 1220540001 # 应用对应的密钥（商户平台开发设置） key = E10ADC3949BA59ABBE56E057F20F883E key = 1PJiendxfSBX9Wrx9mQzNeiXacYwWXFY # 微信回调地址 wx_notify_url = http://116.63.172.131:8088/order/forepart/paylog/wxpay/notify wx_notify_url = http://10.136.177.152:9000/order/forepart/paylog/wxpay/notify # 小程序的APPID XappID =wxe91f1af7638aa5dd XappID =wx69e3ac6e13a889b7
@@ -7,6 +7,7 @@ WHERE o.goods_sku_id = #{id} AND o.order_from=2 AND o.del_flag=0 AND o.order_status IN (2 , 3 , 4) @@ -22,6 +23,7 @@ WHERE o.goods_sku_id = #{goodsSkuId} AND o.order_from=3 AND o.del_flag=0 AND o.order_status IN (2,3,4) and o.member_id =#{memberId} </select> @@ -35,6 +37,7 @@ t_order o <where> o.order_status = 2 AND o.del_flag=0 AND o.order_from = 3 AND o.goods_sku_id = #{id} </where> @@ -50,6 +53,7 @@ o.goods_sku_id = #{goodsSkuId} AND o.order_status = 2 AND o.order_from = 3 AND o.del_flag=0 AND o.member_id=#{memberId} </where> </select> @@ -67,6 +71,7 @@ AND o.sku_name LIKE CONCAT('%',#{skuName},'%') </if> AND o.order_from = 3 AND o.del_flag=0 AND o.member_id=#{memberId} </where> </select> @@ -83,6 +88,7 @@ AND o.sku_name LIKE CONCAT('%',#{skuName},'%') </if> AND o.order_from = 3 AND o.del_flag=0 AND o.member_id=#{memberId} </where> </select> @@ -97,6 +103,7 @@ o.goods_sku_id = #{goodsSkuId} AND o.order_status = 2 or o.order_status =1 AND o.order_from = 3 AND o.del_flag=0 AND o.member_id=#{memberId} </where> </select>
