记得上下班打卡 | git大法好,push需谨慎

Commit ae7aa6a8 authored by 胡佳晨's avatar 胡佳晨

提交可 扫二维码 演出列表

parent ce553850
...@@ -20,4 +20,7 @@ public class SlimeRedisConst { ...@@ -20,4 +20,7 @@ public class SlimeRedisConst {
// 无敌账号 // 无敌账号
public static final String SUPER_ACCOUNT = PREFIX.concat("super:account:"); public static final String SUPER_ACCOUNT = PREFIX.concat("super:account:");
// 临时可扫二维码演出列表
public static final String QR_CODE_PERFORMANCE = PREFIX.concat("qrCode:performance");
} }
...@@ -56,7 +56,7 @@ goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag ...@@ -56,7 +56,7 @@ goblin.self.market.delSpuRelation=UPDATE goblin_marketing_zhengzai SET del_flag
#---- 订单创建&支付 #---- 订单创建&支付
goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`pay_code`,`market_id`,`market_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) goblin.order.create.order_insert=INSERT INTO goblin_store_order (`master_order_code`,`order_id`,`store_id`,`store_name`,`order_code`,`user_id`,`user_name`,`user_mobile`,`price_total`,`price_actual`,`price_refund`,`price_express`,`price_coupon`,`price_voucher`,`status`,`ucoupon_id`,`pay_type`,`device_from`,`source`,`version`,`is_member`,`order_type`,`write_off_code`,`pay_countdown_minute`,`ip_address`,`pay_code`,`market_id`,`market_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin.order.create.attr_insert=INSERT INTO goblin_order_attr (`order_attr_id`,`order_id`,`express_contacts`,`express_address`,`express_address_detail`,`express_phone`,`express_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?) goblin.order.create.attr_insert=INSERT INTO goblin_order_attr (`order_attr_id`,`order_id`,`express_contacts`,`express_address`,`express_address_detail`,`express_phone`,`express_type`,`created_at`) VALUES (?,?,?,?,?,?,?,?)
goblin.order.create.sku_insert=INSERT INTO goblin_order_sku (`order_sku_id`,`order_id`,`spu_id`,`spu_name`,`spu_pic`,`sku_id`,`num`,`sku_price`,`sku_price_actual`,`sku_name`,`sku_no`,`sku_image`,`sku_specs`,`price_voucher`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?) goblin.order.create.sku_insert=INSERT INTO goblin_order_sku (`order_sku_id`,`order_id`,`spu_id`,`spu_name`,`spu_pic`,`sku_id`,`num`,`sku_price`,`sku_price_actual`,`sku_name`,`sku_no`,`sku_image`,`sku_specs`,`price_voucher`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.pay.order=UPDATE goblin_store_order SET payment_type = ? ,payment_id=?,pay_code = ? ,pay_time = ?,write_off_code = ? ,status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null) goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
#---- 再次支付 #---- 再次支付
......
...@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo; ...@@ -8,6 +8,7 @@ import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService; import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
import com.liquidnet.service.slime.util.InnerUtils; import com.liquidnet.service.slime.util.InnerUtils;
import com.liquidnet.service.slime.util.PerformanceUtils; import com.liquidnet.service.slime.util.PerformanceUtils;
import com.liquidnet.service.slime.util.RedisSlimeUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponse;
...@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
/** /**
...@@ -39,6 +41,8 @@ public class KylinBuyNoticeParnterController { ...@@ -39,6 +41,8 @@ public class KylinBuyNoticeParnterController {
InnerUtils innerUtils; InnerUtils innerUtils;
@Autowired @Autowired
PerformanceUtils performanceUtils; PerformanceUtils performanceUtils;
@Autowired
RedisSlimeUtils redisSlimeUtils;
@GetMapping(value = "buyNotice") @GetMapping(value = "buyNotice")
@ApiOperation(value = "购票须知列表", position = 1) @ApiOperation(value = "购票须知列表", position = 1)
...@@ -65,4 +69,11 @@ public class KylinBuyNoticeParnterController { ...@@ -65,4 +69,11 @@ public class KylinBuyNoticeParnterController {
public ResponseDto<List<KylinExpressModuleVo>> getExpressList() { public ResponseDto<List<KylinExpressModuleVo>> getExpressList() {
return buyNoticePartnerService.getExpressList(); return buyNoticePartnerService.getExpressList();
} }
@GetMapping(value = "qrPerformance")
@ApiOperation(value = "可扫二维码的演出列表", position = 1)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<List<HashMap<String, String>>> qrPerformance() {
return ResponseDto.success(redisSlimeUtils.qrPerformance());
}
} }
package com.liquidnet.service.slime.util; package com.liquidnet.service.slime.util;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo; import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo; import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
...@@ -12,6 +13,8 @@ import com.liquidnet.service.slime.service.SlimeRdmService; ...@@ -12,6 +13,8 @@ import com.liquidnet.service.slime.service.SlimeRdmService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
@Component @Component
...@@ -272,4 +275,25 @@ public class RedisSlimeUtils { ...@@ -272,4 +275,25 @@ public class RedisSlimeUtils {
String redisKey = SlimeRedisConst.SUPER_ACCOUNT.concat(merchantId); String redisKey = SlimeRedisConst.SUPER_ACCOUNT.concat(merchantId);
return redisUtil.hasKey(redisKey); return redisUtil.hasKey(redisKey);
} }
/**
* 是否为超级权限账户
*
* @return
*/
public List<HashMap<String, String>> qrPerformance() {
String redisKey = SlimeRedisConst.QR_CODE_PERFORMANCE;
Object obj = redisUtil.get(redisKey);
if (obj == null) {
List<HashMap<String, String>> listMap = new ArrayList<>();
HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("name", "测试演出");
map.put("id", "112233");
listMap.add(map);
redisUtil.set(redisKey, listMap);
return listMap;
} else {
return (List<HashMap<String, String>>) redisUtil.get(redisKey);
}
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment