feat: 配置修改

poyi-app/src/main/java/com/tzy/controller/appuser/AppUserControllerNew.java

@@ -1713,22 +1713,6 @@ public class AppUserControllerNew {
                 .put("platformTotal", mineCardDTO.getPlatformTotal());
     }
 
-    @ApiLog(title = "预售订单主动退款", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-    @PostMapping("/order/refund")
-    public OutDTO refundPreSaleOrder(@RequestBody InDto inDto) {
-        if (null == inDto) {
-            return OutDTO.error500("参数不能为空!");
-        }
-        Integer orderId = (Integer) inDto.get("orderId");
-        if (orderId == null) {
-            return OutDTO.error500("orderId不能为空!");
-        }
-        AppUserInfoDto user = mineApiService.checkUserNew(inDto);
-        cardGroupOrderInfoService.refundPreSaleOrder(user.getId(), orderId.longValue());
-        return OutDTO.ok();
-    }
-
-
     @ApiLog(title = "首页消息提醒(5合1版)", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
     @PostMapping("/msg/recommend")
     public OutDTO getUserMsgRecommend(@RequestBody InDto inDto) throws Exception {

poyi-app/src/main/java/com/tzy/controller/mall/MallOrderController.java

@@ -24,7 +24,6 @@ import com.tzy.service.MallOrderService;
 import com.tzy.sportcard.api.domain.AppUserInfoDto;
 import com.tzy.sportcard.api.service.AsyncAppService;
 import com.tzy.sportcard.api.service.MineApiService;
-import com.tzy.sportcard.api.service.PayService;
 import com.tzy.sportcard.group.domain.CardGroupOrderInfo;
 import com.tzy.sportcard.group.service.ICardGroupOrderInfoService;
 import io.swagger.annotations.Api;
@@ -74,8 +73,6 @@ public class MallOrderController extends BaseController {
 	private MemberBenefitsRecordMapper memberBenefitsRecordMapper;
 	@Resource
 	private  RabbitTemplate rabbitTemplate;
-	@Autowired
-	private PayService payService;
 
 
 	@ApiLog(title = "提交订单", businessType = BusinessType.SEARCH)
@@ -325,103 +322,27 @@ public class MallOrderController extends BaseController {
 	@ApiOperation("售后客服介入或接受商家拒绝退款操作")
 	@ResponseBody
 	@PostMapping(value = "/saleCustomerServiceOrNot")
-	public OutDTO saleCustomerService(@RequestBody InDto inDto){
-		mineApiService.checkUserNew(inDto);
-		Integer orderId = (Integer) inDto.get("orderId");
-		CardGroupOrderInfo cardGroupOrderInfo = cardGroupOrderInfoService.selectCardGroupOrderInfoById(orderId.longValue());
-		if(null == cardGroupOrderInfo ){
-			return OutDTO.error(10040,"未找到订单信息");
-		}
-
-		if(cardGroupOrderInfo.getRefundStatus()!=3){
-			return OutDTO.error(500,"请等待商家操作!");
-		}
-
-		CardGroupOrderInfo updateOrder = new CardGroupOrderInfo();
-		updateOrder.setId(cardGroupOrderInfo.getId());
-		if(inDto.get("refundStatus")==null){
-			updateOrder.setRefundStatus(6);
-		}else{
-			updateOrder.setRefundStatus((Integer)inDto.get("refundStatus"));
-		}
-		cardGroupOrderInfoService.updateCardGroupOrderInfo(updateOrder);
-		return OutDTO.ok();
-	}
-
-	@ApiLog(title = "商城支付方式", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-	@ResponseBody
-	@PostMapping(value = "/v1/checkPayCat")
-	public OutDTO checkPayCat(@RequestBody InDto inDto) {
-		AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-		return payService.checkGoodsPayCat( inDto, appUserInfoDto);
-	}
-
-	@ApiLog(title = "商城支付方式-v2 支持香港支付", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-	@ResponseBody
-	@PostMapping(value = "/v2/checkPayCat")
-	public OutDTO checkPayCatV2(@RequestBody InDto inDto) {
-		AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-		return payService.checkGoodsPayCatV2( inDto, appUserInfoDto);
-	}
-
-	@ApiLog(title = "商城支付方式-v3 用户标签重构", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-	@ResponseBody
-	@PostMapping(value = "/v3/checkPayCat")
-	public OutDTO checkPayCatV3(@RequestBody InDto inDto) {
-		AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-		return payService.checkGoodsPayCatV3( inDto, appUserInfoDto);
-	}
-
-	/**
-	 * @param inDto
-	 * @return
-	 */
-	@ApiLog(title = "对公转账上传", businessType = BusinessType.SEARCH)
-	@ResponseBody
-	@ApiVersion(1.0)
-	@ApiOperation("对公转账上传")
-	@PostMapping("/{version}/corporatePublicToPay")
-	public OutDTO corporatePublicToPay(@RequestBody InDto inDto ,@PathVariable("version") String version){
-		Object orderId = inDto.get("orderId");
-		if(Objects.isNull(orderId)){
-			OutDTO.error(500, "订单id不能为空!");
-		}
-		AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-		return payService.corporatePublicToPay(version,inDto,appUserInfoDto);
-	}
-
-
-	@ApiLog(title = "预支付3", businessType = BusinessType.SEARCH)
-	@ResponseBody
-	@ApiVersion(1.0)
-	@ApiOperation("预支付3")
-	@PostMapping("/v3/prePayNew")
-	public OutDTO orderPrePayNewV3(@RequestBody InDto inDto) {
-		Integer orderId = inDto.getIntegerParam("orderId");
-		if (orderId == null) {
-			return OutDTO.error500("id为空!");
-		}
-		AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-		return payService.orderPrePayV3(inDto, appUserInfoDto, orderId.longValue(), "goods");
-	}
-
-	/**
-	 * 订单预支付-新通道 新分配规则
-	 * @param inDto
-	 * @return
-	 */
-	@ApiLog(title = "预支付4【订单预支付-新通道 新分配规则】", businessType = BusinessType.SEARCH)
-	@ResponseBody
-	@ApiVersion(1.0)
-	@ApiOperation("预支付4")
-	@PostMapping("/v4/prePayNew")
-	public OutDTO orderPrePayNewV4(@RequestBody InDto inDto) {
-		Integer orderId = inDto.getIntegerParam("orderId");
-		if (orderId == null) {
-			return OutDTO.error500("id为空!");
-		}
-		AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-		return payService.orderPrePayV4(inDto, appUserInfoDto, orderId.longValue(), "goods");
-	}
+	public OutDTO saleCustomerService(@RequestBody InDto inDto) {
+        mineApiService.checkUserNew(inDto);
+        Integer orderId = (Integer) inDto.get("orderId");
+        CardGroupOrderInfo cardGroupOrderInfo = cardGroupOrderInfoService.selectCardGroupOrderInfoById(orderId.longValue());
+        if (null == cardGroupOrderInfo) {
+            return OutDTO.error(10040, "未找到订单信息");
+        }
+
+        if (cardGroupOrderInfo.getRefundStatus() != 3) {
+            return OutDTO.error(500, "请等待商家操作!");
+        }
+
+        CardGroupOrderInfo updateOrder = new CardGroupOrderInfo();
+        updateOrder.setId(cardGroupOrderInfo.getId());
+        if (inDto.get("refundStatus") == null) {
+            updateOrder.setRefundStatus(6);
+        } else {
+            updateOrder.setRefundStatus((Integer) inDto.get("refundStatus"));
+        }
+        cardGroupOrderInfoService.updateCardGroupOrderInfo(updateOrder);
+        return OutDTO.ok();
+    }
 
 }

poyi-app/src/main/resources/application.yml

@@ -230,6 +230,10 @@ elasticsearch:
     #uris: localhost:9200,localhost:9300  #测试环境es地址
     uris: 192.168.50.10:9202  #测试环境es地址
 
+#直播间webSocket地址
+liveWebSocketUrl: http://poyee-im/chat/handler
+
+
 management:
   endpoints:
     web:

poyi-app/src/main/resources/db/migration/V1.1_app_test_data_edit.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."test_data"
-  ADD COLUMN "create_user" varchar(255);

poyi-app/src/main/resources/db/migration/V1.2_app_user_member.sql

@@ -1,50 +0,0 @@
-CREATE TABLE "public"."member_manage" (
-"id" int4 NOT NULL GENERATED ALWAYS AS IDENTITY (
-  INCREMENT 1
-  MINVALUE  1
-  MAXVALUE 2147483647
-  START 1
-  ),
-"level" int4,
-"level_name" varchar(32),
-"growth_value" int4,
-"keep_value" int4,
-"type" int4,
-"status" int4 default 0,
-"create_time" timestamp,
-"update_time" timestamp,
-CONSTRAINT "member_manage_pkey" PRIMARY KEY ("id")
-);
-
-
-COMMENT ON COLUMN "public"."member_manage"."level" IS '会员等级';
-
-COMMENT ON COLUMN "public"."member_manage"."growth_value" IS '成长值';
-
-COMMENT ON COLUMN "public"."member_manage"."status" IS '状态,0:新建,1:审核通过';
-
-COMMENT ON COLUMN "public"."member_manage"."keep_value" IS '保级门槛';
-
-COMMENT ON COLUMN "public"."member_manage"."type" IS '类型：1.用户 2.商家';
-
-COMMENT ON COLUMN "public"."member_manage"."level_name" IS '等级名称';
-
-
-ALTER TABLE "public"."app_base_user"
-    ADD COLUMN "member_level" int2,
-    ADD COLUMN "member_name" varchar(32),
-    ADD COLUMN "current_month_growth" int4,
-    ADD COLUMN "member_init_flag" int2  default 0,
-    ADD COLUMN "member_keep_growth" int4;
-
-COMMENT ON COLUMN "public"."app_base_user"."member_level" IS '会员等级';
-
-COMMENT ON COLUMN "public"."app_base_user"."member_name" IS '会员名称';
-
-COMMENT ON COLUMN "public"."app_base_user"."current_month_growth" IS '当月已获取成长值';
-
-COMMENT ON COLUMN "public"."app_base_user"."member_init_flag" IS '月初初始化标志,默认0:未开始,1:已初始化';
-
-COMMENT ON COLUMN "public"."app_base_user"."member_keep_growth" IS '当前会员保级所需成长值';
-
-

poyi-app/src/main/resources/db/migration/V1.3_app_user_member_edit.sql

@@ -1,5 +0,0 @@
-ALTER TABLE "public"."app_base_user"
-    ALTER COLUMN "member_level" SET DEFAULT 0;
-
-ALTER TABLE "public"."app_base_user"
-    ALTER COLUMN "member_keep_growth" SET DEFAULT 0;

poyi-app/src/main/resources/db/migration/V1.4_app_member_benefits_new.sql

@@ -1,83 +0,0 @@
-CREATE TABLE "public"."member_benefits" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" varchar(32),
-    "value" decimal(10,2),
-    "ref_id" int4,
-    "num" int2 default 1,
-    "receive_type" varchar(32),
-    "goods_level" int2,
-    "status" int2 default 0,
-    "super_tag" int2 default 0,
-    "create_time" timestamp,
-    "update_time" timestamp,
-    PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "public"."member_benefits"."type" IS '权益类型,关联商品:goods,优惠劵:coupon,积分权益:point,折扣:goods_discount,组队折扣:group_discount,运费券:shipping_free';
-
-COMMENT ON COLUMN "public"."member_benefits"."value" IS '数值类权益值,积分倍数,商品折扣';
-
-COMMENT ON COLUMN "public"."member_benefits"."ref_id" IS '关联权益值id,商品id,优惠劵id等';
-
-COMMENT ON COLUMN "public"."member_benefits"."num" IS '数量';
-
-COMMENT ON COLUMN "public"."member_benefits"."receive_type" IS '赠送类权益领取次数,once:一次,month:月,year:年等';
-
-COMMENT ON COLUMN "public"."member_benefits"."goods_level" IS '可看见的商品等级';
-
-COMMENT ON COLUMN "public"."member_benefits"."status" IS '状态,0:新建,1:在线';
-
-COMMENT ON COLUMN "public"."member_benefits"."super_tag" IS '专属标签,根据标签在特殊场合使用特殊特效';
-
-
-
-CREATE TABLE "public"."member_benefits_manage" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "member_id" int4,
-    "member_benefits_id" int4,
-    "time_type" int4 default 0,
-    "start_time" timestamp,
-    "end_time" timestamp,
-    "create_time" timestamp,
-    PRIMARY KEY ("id")
-);
-
-
-COMMENT ON COLUMN "public"."member_benefits_manage"."member_id" IS '会员id';
-
-COMMENT ON COLUMN "public"."member_benefits_manage"."member_benefits_id" IS '权益id';
-
-COMMENT ON COLUMN "public"."member_benefits_manage"."time_type" IS '权益生效时间类型,0:永久,1:自定义时间段';
-
-COMMENT ON COLUMN "public"."member_benefits_manage"."start_time" IS '权益生效开始时间';
-
-COMMENT ON COLUMN "public"."member_benefits_manage"."end_time" IS '权益生效结束时间';
-
-
-
-CREATE TABLE "public"."member_benefits_record" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "user_id" int4,
-    "member_id" int4,
-    "member_benefits_id" int4,
-    "benefits_ref_id" int4,
-    "status" int2 default 0,
-    "receive_num" int2 default 1,
-    "user_num" int2 default 0,
-    "create_time" timestamp,
-    "update_time" timestamp,
-    PRIMARY KEY ("id")
-);
-
-
-COMMENT ON COLUMN "public"."member_benefits_record"."user_id" IS '用户id';
-
-COMMENT ON COLUMN "public"."member_benefits_record"."member_id" IS '会员id';
-
-COMMENT ON COLUMN "public"."member_benefits_record"."member_benefits_id" IS '权益id';
-
-COMMENT ON COLUMN "public"."member_benefits_record"."benefits_ref_id" IS '权益关联id';
-
-COMMENT ON COLUMN "public"."member_benefits_record"."receive_num" IS '领取数量';
-
-COMMENT ON COLUMN "public"."member_benefits_record"."user_num" IS '使用数量';

poyi-app/src/main/resources/db/migration/V1.5_app_goods_act_edit.sql

@@ -1,38 +0,0 @@
-
-CREATE TABLE "public"."goods_act_record" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "act_type" varchar(32) NOT NULL,
-    "group_info_id" int4,
-    "goods_id" int4,
-    "goods_type" int2 DEFAULT 0,
-    "ref_id" int4,
-    "act_value" int4,
-    "act_desc" varchar(1024),
-    "act_value_type" varchar(64),
-    "act_img" varchar(1024),
-    "status" int2 DEFAULT 0,
-    "create_time" timestamp,
-    "prop1" text,
-    PRIMARY KEY ("id")
-)
-;
-
-COMMENT ON COLUMN "public"."goods_act_record"."act_type" IS '活动类型';
-
-COMMENT ON COLUMN "public"."goods_act_record"."group_info_id" IS '组队id';
-
-COMMENT ON COLUMN "public"."goods_act_record"."goods_id" IS '卡密id';
-
-COMMENT ON COLUMN "public"."goods_act_record"."goods_type" IS '卡密数据库类型,默认0,1:新库';
-
-COMMENT ON COLUMN "public"."goods_act_record"."ref_id" IS '关联活动商品id';
-
-COMMENT ON COLUMN "public"."goods_act_record"."act_value" IS '活动值';
-
-COMMENT ON COLUMN "public"."goods_act_record"."act_value_type" IS '活动奖励类型';
-
-COMMENT ON COLUMN "public"."goods_act_record"."act_desc" IS '活动文字描述';
-
-COMMENT ON COLUMN "public"."goods_act_record"."act_img" IS '活动图片';
-
-COMMENT ON COLUMN "public"."goods_act_record"."prop1" IS '备用字段';

poyi-app/src/main/resources/db/migration/V1.6_app_user_edit.sql

@@ -1,13 +0,0 @@
-ALTER TABLE "public"."app_base_user"
-    ADD COLUMN "register_ip_addr" varchar(32),
-    ADD COLUMN "register_addr" varchar(256),
-    ADD COLUMN "login_ip_addr" varchar(32),
-    ADD COLUMN "login_addr" varchar(256);
-
-COMMENT ON COLUMN "public"."app_base_user"."login_ip_addr" IS '用户上一次登陆ip';
-
-COMMENT ON COLUMN "public"."app_base_user"."login_addr" IS '用户上一次登陆省区';
-
-COMMENT ON COLUMN "public"."app_base_user"."register_addr" IS '用户注册省区';
-
-COMMENT ON COLUMN "public"."app_base_user"."register_ip_addr" IS '用户注册ip';

poyi-app/src/main/resources/db/migration/V1.7_app_goods_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "public"."card_group_goods"
-    ADD COLUMN "goods_sign" text;
-
-COMMENT ON COLUMN "public"."card_group_goods"."goods_sign" IS '签名';

poyi-app/src/main/resources/db/migration/V1.8_app_user_cat_new.sql

@@ -1,58 +0,0 @@
-
-CREATE TABLE "public"."app_category" (
-      "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-      "type" varchar(32),
-      "name" varchar(64),
-      "desc" text,
-      "create_time" time,
-      "update_time" time,
-      PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "public"."app_category"."type" IS '用户标签类型,user_pay等';
-
-COMMENT ON COLUMN "public"."app_category"."name" IS '用户标签名字';
-
-COMMENT ON COLUMN "public"."app_category"."desc" IS '用户标签描述';
-
-CREATE TABLE "public"."app_user_category" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "user_id" int4 NOT NULL,
-     "cat_id" int4 NOT NULL,
-     "create_time" time,
-     PRIMARY KEY ("id")
-);
-
-CREATE INDEX "u-c-uid-cid" ON "public"."app_user_category" USING btree (
-  "user_id",
-  "cat_id"
-);
-
-COMMENT ON COLUMN "public"."app_user_category"."user_id" IS 'app用户id';
-
-COMMENT ON COLUMN "public"."app_user_category"."cat_id" IS '用户关联分类id';
-
-
-CREATE TABLE "public"."app_category_payment" (
-      "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-      "cat_id" int4 NOT NULL,
-      "ref_pay_id" int4 NOT NULL,
-      "weight_num" varchar(32),
-      "status" int2 default 0,
-      "create_time" time,
-      PRIMARY KEY ("id")
-);
-
-CREATE INDEX "u-c-p-pid-cid" ON "public"."app_category_payment" USING btree (
-  "ref_pay_id",
-  "cat_id",
-  "status"
-);
-
-
-COMMENT ON COLUMN "public"."app_category_payment"."weight_num" IS '分类支付权重值,';
-
-COMMENT ON COLUMN "public"."app_category_payment"."status" IS '默认0:不生效,1:生效';
-
-
-

poyi-app/src/main/resources/db/migration/V1.9_app_account_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "public"."app_account"
-    ADD COLUMN "log_off_time" timestamp;
-
-COMMENT ON COLUMN "public"."app_account"."log_off_time" IS '注销时间';

poyi-app/src/main/resources/db/migration/V2.0_app_user_business_settled_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_user_business_settled"
-    ADD COLUMN "main_pro_category" varchar(255);
-
-COMMENT ON COLUMN "app_user_business_settled"."main_pro_category" IS '主营类目';

poyi-app/src/main/resources/db/migration/V2.1_user_list_act.sql

@@ -1,23 +0,0 @@
-CREATE TABLE "public"."user_list_act" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "type" varchar(32) NOT NULL,
-     "user_id" int4 NOT NULL,
-     "panini_base_id" int4 NOT NULL,
-     "panini_ref_id" int4 NOT NULL,
-     "num" int4 DEFAULT 1,
-     "order_ids" text,
-     "create_time" timestamp,
-     "update_time" timestamp,
-     PRIMARY KEY ("id")
-)
-;
-
-COMMENT ON COLUMN "public"."user_list_act"."type" IS '全部卡密:list_act_all_set';
-
-COMMENT ON COLUMN "public"."user_list_act"."panini_base_id" IS '基础baseid';
-
-COMMENT ON COLUMN "public"."user_list_act"."panini_ref_id" IS 'list明细id,根据type记录球队,球员,卡密id';
-
-COMMENT ON COLUMN "public"."user_list_act"."num" IS '收集次数';
-
-COMMENT ON COLUMN "public"."user_list_act"."order_ids" IS '卡密关联订单集合,多个用逗号分割';

poyi-app/src/main/resources/db/migration/V2.2_app_notify_edit.sql

@@ -1,42 +0,0 @@
-ALTER TABLE "app_base_user"
-    ADD COLUMN "notify_top_show" int2 DEFAULT 1,
-    ADD COLUMN "voice_reminder" int2 DEFAULT 1,
-    ADD COLUMN "vibrate_reminder" int2 DEFAULT 1;
-
-COMMENT ON COLUMN "public"."app_base_user"."notify_top_show" IS 'app顶部横幅通知';
-
-COMMENT ON COLUMN "public"."app_base_user"."voice_reminder" IS '声音提醒,默认1:开启,0:关闭';
-
-COMMENT ON COLUMN "public"."app_base_user"."vibrate_reminder" IS '震动提醒,默认1:开启,0:关闭';
-
-
-CREATE TABLE "app_notify_config" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "user_id" int4 NOT NULL,
-     "msg_type" varchar(32) NOT NULL,
-     "show_type" varchar(32) NOT NULL,
-     "status" int2 DEFAULT 1,
-     "config_status" int2 DEFAULT 0,
-     "notify_type" varchar(16),
-     "notify_config" text,
-     "create_time" timestamp,
-     "update_time" timestamp,
-     PRIMARY KEY ("id")
-);
-
-CREATE INDEX "a-n-uid" ON "public"."app_notify_config" USING btree (
-     "user_id"
-);
-
-COMMENT ON COLUMN "public"."app_notify_config"."msg_type" IS '消息大类型';
-
-COMMENT ON COLUMN "public"."app_notify_config"."show_type" IS '展示消息大类型';
-
-COMMENT ON COLUMN "public"."app_notify_config"."status" IS '开启状态:默认1:开启,0:未开启';
-
-COMMENT ON COLUMN "public"."app_notify_config"."config_status" IS '是否有个性化配置:默认0:无,1:开启';
-
-COMMENT ON COLUMN "public"."app_notify_config"."notify_type" IS '提醒类型:全部:all.仅关注:follow,互相关注:mutual_follow,仅购买:buy,自定义:private';
-
-COMMENT ON COLUMN "public"."app_notify_config"."notify_config" IS '开售通知配置json';
-

poyi-app/src/main/resources/db/migration/V2.3_notify_record_edit.sql

@@ -1,7 +0,0 @@
-ALTER TABLE "tzy_sys_notice_record"
-  ADD COLUMN "sub_type" varchar(32),
-  ADD COLUMN "template_id" int4;
-
-COMMENT ON COLUMN "tzy_sys_notice_record"."sub_type" IS '子类型,唯一';
-
-COMMENT ON COLUMN "tzy_sys_notice_record"."template_id" IS '推送模板id';

poyi-app/src/main/resources/db/migration/V2.4_group_act_record_new.sql

@@ -1,19 +0,0 @@
-CREATE TABLE "group_act_record" (
-   "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-   "type" varchar(64) NOT NULL,
-   "ref_id" int4 NOT NULL,
-   "act_type" varchar(64) NOT NULL,
-   "status" int2 DEFAULT 1,
-   "create_time" timestamp,
-   PRIMARY KEY ("id")
-);
-
-CREATE INDEX "gar_gid" ON "group_act_record" USING btree (
-    "type","ref_id","act_type"
-);
-
-COMMENT ON COLUMN "group_act_record"."ref_id" IS '关联记录id(拼团id,订单id)';
-
-COMMENT ON COLUMN "group_act_record"."type" IS '关联类型,拼团:group,订单:order';
-
-COMMENT ON COLUMN "group_act_record"."act_type" IS '活动类型';

poyi-app/src/main/resources/db/migration/V2.5_act_edit.sql

@@ -1,7 +0,0 @@
-ALTER TABLE "app_act_manage"
-   ADD COLUMN "act_over_time" timestamp,
-   ADD COLUMN "rule_config" text;
-
-COMMENT ON COLUMN "public"."app_act_manage"."act_over_time" IS '活动最后参与时间';
-
-COMMENT ON COLUMN "public"."app_act_manage"."rule_config" IS '规则json配置';

poyi-app/src/main/resources/db/migration/V2.6_act_record_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_act_prize_record"
-   ADD COLUMN "ref_prize_id" int4;
-
-COMMENT ON COLUMN "public"."app_act_prize_record"."ref_prize_id" IS '关联奖品id';

poyi-app/src/main/resources/db/migration/V2.7_member_benefits_edit.sql

@@ -1,10 +0,0 @@
-ALTER TABLE  "member_benefits"
-   ADD COLUMN "limit_num" int4 DEFAULT 0,
-  ADD COLUMN "limit_time_type" varchar(32),
-  ADD COLUMN "limit_time_value" int4;
-
-COMMENT ON COLUMN "member_benefits"."limit_num" IS '每日限购';
-
-COMMENT ON COLUMN "member_benefits"."limit_time_type" IS '限购时间类型';
-
-COMMENT ON COLUMN "member_benefits"."limit_time_value" IS '限购时间值';

poyi-app/src/main/resources/db/migration/V2.8_act_edit.sql

@@ -1,31 +0,0 @@
-ALTER TABLE  "user_list_act"
-   ADD COLUMN "exchange_num" int4 DEFAULT 0,
-   ADD COLUMN "ref_act_id" int4;
-
-COMMENT ON COLUMN "user_list_act"."ref_act_id" IS '关联list活动id';
-
-
-ALTER TABLE "goods_act_record"
-   ADD COLUMN "user_limit_num" int4 DEFAULT 0,
-  ADD COLUMN "day_limit_num" int4 DEFAULT 0,
-  ADD COLUMN "total_limit_num" int4 DEFAULT 0,
-  ADD COLUMN "sort_num" int4 DEFAULT 0,
-  ADD COLUMN "start_time" timestamp,
-  ADD COLUMN "end_time" timestamp;
-
-COMMENT ON COLUMN "goods_act_record"."user_limit_num" IS '用户限购数量';
-
-COMMENT ON COLUMN "goods_act_record"."day_limit_num" IS '每日限购总量';
-
-COMMENT ON COLUMN "goods_act_record"."total_limit_num" IS '总计限购数量';
-
-COMMENT ON COLUMN "goods_act_record"."sort_num" IS '排序值';
-
-COMMENT ON COLUMN "goods_act_record"."start_time" IS '活动开始时间';
-
-COMMENT ON COLUMN "goods_act_record"."end_time" IS '活动结束时间';
-
-
-CREATE INDEX "s_act_id" ON "user_list_act" USING btree (
-   "ref_act_id"
-   );

poyi-app/src/main/resources/db/migration/V2.9_list_act_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "panini_check_list"
-   ADD COLUMN "act_status" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "panini_check_list"."act_status" IS '是否参与收集活动';

poyi-app/src/main/resources/db/migration/V3.0_grade_order_new.sql

@@ -1,150 +0,0 @@
---评级表
-DROP TABLE IF EXISTS "grade_order";
-CREATE TABLE "grade_order" (
-      "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-      "type" varchar(32),
-      "order_no" varchar(32),
-      "user_id" int4 NOT NULL,
-      "merchant_id" int4 ,
-      "parent_id" int4 DEFAULT 0,
-      "grade_type" varchar(32),--评级类型,送评(Grading),重评(Review),换壳(Reholder),换评(Crossover)
-      "auth_type_id" int4,--认证类型
-      "service_type_id" int4,--服务类型
-      "card_size" varchar(64),--评级尺寸
-      "grade_num" int4 DEFAULT 0,--实际评级数量
-      "user_consign_num" int4 NOT NULL,--用户寄送数
-      "refund_num" int4 DEFAULT 0,--退回总数
-      "status" int4 DEFAULT 0,
-      "pay_status" int4 DEFAULT 0,
-      "service_amount" numeric(9,2),--平台服务费
-      "earnest_amount" numeric(9,2),--保证金
-      "evaluate_amount" numeric(9,2),--评估价
-      "insure_amount" numeric(9,2),--保管费
-      "grade_amount" numeric(9,2),--送评费用
-      "accounts_payable" numeric(9,2),--应付金额
-      "actual_amount" numeric(9,2),--实付金额
-      "coupon_id" int4,
-      "discount_amount" numeric(9,2),--优惠劵金额
-      "user_img_front" text,
-      "user_img_back_" text,
-      "pre_grade_report" text,--预评估报告
-      "grade_report" text,--评级报告
-      "cat" varchar(32),
-      "year" varchar(32),
-      "sport" varchar(32),
-      "manufacturer" varchar(64),
-      "list_set" varchar(256),
-      "card_set" varchar(256),
-      "seq_num" varchar(32),
-      "player_name" varchar(64),
-      "send_courier_num" varchar(64),
-      "send_courier_company" varchar(64),
-      "send_courier_img" text,
-      "grade_courier_num" varchar(64),
-      "grade_courier_company" varchar(64),
-      "grade_courier_img" text,
-      "back_courier_num" varchar(64),
-      "back_courier_company" varchar(64),
-      "back_courier_img" text,
-      "refund_courier_num" varchar(64),
-      "refund_courier_company" varchar(64),
-      "refund_courier_img" text,
-      "address_id" int4,
-      "link_name" varchar(128),
-      "link_phone" varchar(32),
-      "address" varchar(1024),
-      "grade_prop" text,
-      "remark" text,
-      "del_flg" int2 DEFAULT 0,
-      "create_time" timestamp,
-      "update_by" varchar(128),
-      "update_time" timestamp,
-      "prop1" text,
-      "prop2" text,
-      "prop3" text,
-      PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "grade_order"."user_consign_num" IS '用户寄送数';
-
-COMMENT ON COLUMN "grade_order"."grade_type" IS '评级类型,送评(Grading),重评(Review),换壳(Reholder),换评(Crossover)';
-
-COMMENT ON COLUMN "grade_order"."pay_status" IS '支付状态,同订单 100:待支付, 101:已支付,204,205,206:退款';
-
-COMMENT ON COLUMN "grade_order"."status"
-    IS '评级状态 0:新建, 10:已支付,待寄送,20:已寄送,待签收,30:已签收,待评估,40:已评估,待用户支付,50:待送评级,60:已出报告,未回寄,70:评级已回寄,待回寄用户,80:用户签收,90:完结:201:取消';
-
-CREATE INDEX "g-o-uid" ON "grade_order" USING btree (
-    "user_id"
-);
-
-CREATE INDEX "g-o-p-id" ON "grade_order" USING btree (
-    "parent_id"
-);
-
-DROP TABLE IF EXISTS "grade_change_record";
---评级信息记录
-CREATE TABLE "grade_change_record" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "type" varchar(32),--新建,寄送,签收1(hb),评估估价,用户支付,送去评级,补差价,出报告,签收2(评级公司),寄回用户
-     "order_id" int4 NOT NULL,
-     "title" varchar(255),--标题
-     "describe" text,--用户显示
-     "remark" text,--内部说明
-     "status" int4 DEFAULT 0,
-     "pay_status" int4 DEFAULT 0,
-     "accounts_payable" numeric(9,2),
-     "actual_payment" numeric(9,2),
-     "trade_amount" numeric(9,2),
-     "coupon_id" int4,
-     "discount_amount" numeric(9,2),--优惠劵金额
-     "payment_type" varchar(64),
-     "payment_sub_type" varchar(64),
-     "trade_no" varchar(128),
-     "payment_num" varchar(128),
-     "payment_time" timestamp,
-     "payment_success_time" timestamp,
-     "payment_bank_type" varchar(64),
-     "payment_status" varchar(64),
-     "refund_fee" numeric(9,2) DEFAULT 0,
-     "refund_trade_no" varchar(128),
-     "refund_id" varchar(255),
-     "refund_time" timestamp,
-     "refund_success_time" timestamp,
-     "show_status" int4 DEFAULT 0,
-     "create_time" timestamp,
-     "update_time" timestamp,
-     "prop1" text,
-     "prop2" text,
-     "prop3" text,
-     PRIMARY KEY ("id")
-);
-
-CREATE INDEX "g-r-o-id" ON "grade_change_record" USING btree (
-    "order_id"
-);
-
-CREATE INDEX "g-r-p-no" ON "grade_change_record" USING btree (
-    "trade_no"
-);
-
-DROP TABLE IF EXISTS "grade_type_manage";
---评级类型表
-CREATE TABLE "grade_type_manage" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" varchar(32),
-    "parent_id" int4 DEFAULT 0,
-    "name" varchar(256),
-    "title" varchar(256),
-    "amount" numeric(9,2),
-    "rate_type" int2 DEFAULT 0,
-    "service_rate" numeric(9,2),
-    "describe" text,
-    "config_prop" text,
-    "img" text,
-    "status" int4 DEFAULT 0,
-    "sort_num" int4 DEFAULT 0,
-    "create_time" timestamp,
-    "update_time" timestamp,
-    PRIMARY KEY ("id")
-);

poyi-app/src/main/resources/db/migration/V3.1_act_edit.sql

@@ -1,5 +0,0 @@
-
-ALTER TABLE "app_act_manage"
-    ADD COLUMN "day_limit_num" int4 DEFAULT 0;
-
-COMMENT ON COLUMN "app_act_manage"."day_limit_num" IS '每日限购总数';

poyi-app/src/main/resources/db/migration/V3.2_point_refund.sql

@@ -1,24 +0,0 @@
-CREATE TABLE "point_refund_record" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "user_id" int4 NOT NULL,
-     "merchant_id" int4 NOT NULL,
-     "point_type" varchar(32),
-     "point" int4,
-     "refund_remark" text,
-     "status" int4 DEFAULT 0,
-     "create_time" timestamp,
-     PRIMARY KEY ("id")
-)
-;
-
-CREATE INDEX "pr-uid" ON "point_refund_record" USING btree (
-    "user_id"
-    );
-
-COMMENT ON COLUMN "point_refund_record"."point_type" IS '积分类型';
-
-COMMENT ON COLUMN "point_refund_record"."point" IS '申请退款积分';
-
-COMMENT ON COLUMN "point_refund_record"."refund_remark" IS '申请退款原因';
-
-COMMENT ON COLUMN "point_refund_record"."status" IS '状态:默认0,待扣除积分,1:申请成功,待退款处理,2:已退款';

poyi-app/src/main/resources/db/migration/V3.4_cat_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_act_config"
-    ADD COLUMN "cat_id" int4;
-
-COMMENT ON COLUMN "app_act_config"."cat_id" IS '标签关联id(弹窗等)';

poyi-app/src/main/resources/db/migration/V3.5_app_user_barrage_record_new.sql

@@ -1,10 +0,0 @@
-CREATE TABLE app_user_barrage_record (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "user_id" int4 NOT NULL,
-     "template_id" int4 NOT NULL,
-     "group_info_id" int4 NOT NULL,
-     "create_time" TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-     "remark" varchar(255),
-     PRIMARY KEY ("id")
-);
-

poyi-app/src/main/resources/db/migration/V3.6_app_user_barrage_record_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_user_barrage_record"
-    ADD COLUMN "type" varchar(255);
-
-COMMENT ON COLUMN "app_user_barrage_record"."type" IS '弹幕类型';

poyi-app/src/main/resources/db/migration/V3.7_ad_config_new.sql

@@ -1,67 +0,0 @@
-CREATE TABLE "app_ad_config" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "name" varchar(255),
-     "merchant_id" int4 NOT NULL ,
-     "location_type" varchar(128),
-     "ad_location" varchar(64),
-     "ad_num" int4 default 1,
-     "sub_type" varchar(64),
-     "ad_label" text default 'all',
-     "cost_type" varchar(64) default 'hb_act_ad_fee',
-     "cost_amount" int4 default 0,
-     "ref_id" int4,
-     "ref_code" varchar(255),
-     "ref_name" text,
-     "img_url" text,
-     "status" int2 default 0,
-     "start_time" timestamp,
-     "end_time" timestamp,
-     "start_hour" int4 default 0,
-     "end_hour" int4 default 24,
-     "show_num" int4 default 0,
-     "click_num" int4 default 0,
-     "ad_amount" int4 default 0,
-     "create_time" timestamp,
-     "update_time" timestamp,
-     PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "app_ad_config"."location_type" IS '位置类型,search_hot,sport_basketball,sport_Soccer,sport_other,sport_综合收藏,group,search';
-
-COMMENT ON COLUMN "app_ad_config"."name" IS '名称';
-
-COMMENT ON COLUMN "app_ad_config"."ad_location" IS '广告位置';
-
-COMMENT ON COLUMN "app_ad_config"."ad_num" IS '广告序号,1,5,10';
-
-COMMENT ON COLUMN "app_ad_config"."sub_type" IS '投放形式,拼团:group,店铺:shop';
-
-COMMENT ON COLUMN "app_ad_config"."cost_type" IS '计费类型,积分,hb_act_ad_fee,金额:amount';
-
-COMMENT ON COLUMN "app_ad_config"."cost_amount" IS '计费金额(积分),单位分';
-
-COMMENT ON COLUMN "app_ad_config"."ref_id" IS '关联id';
-
-COMMENT ON COLUMN "app_ad_config"."ref_code" IS '关联code';
-
-COMMENT ON COLUMN "app_ad_config"."ref_name" IS '关联名称';
-
-COMMENT ON COLUMN "app_ad_config"."img_url" IS '图片地址';
-
-COMMENT ON COLUMN "app_ad_config"."status" IS '状态';
-
-COMMENT ON COLUMN "app_ad_config"."start_time" IS '投放时间';
-
-COMMENT ON COLUMN "app_ad_config"."end_time" IS '投放结束时间';
-
-COMMENT ON COLUMN "app_ad_config"."start_hour" IS '当日起始时间,小时';
-
-COMMENT ON COLUMN "app_ad_config"."end_hour" IS '当日结束时间,小时';
-
-COMMENT ON COLUMN "app_ad_config"."ad_label" IS '投放标签,默认all全部';
-
-COMMENT ON COLUMN "app_ad_config"."show_num" IS '显示次数';
-
-COMMENT ON COLUMN "app_ad_config"."click_num" IS '点击次数';
-
-COMMENT ON COLUMN "app_ad_config"."ad_amount" IS '广告实际费用,单位分';

poyi-app/src/main/resources/db/migration/V3.8_act_record_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_act_prize_record"
-    ADD COLUMN "user_member" int4 default 0;
-
-COMMENT ON COLUMN "app_act_prize_record"."user_member" IS '参与时会员等级';

poyi-app/src/main/resources/db/migration/V3.9_ad_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_ad_config"
-    ADD COLUMN "link_url" text ;
-
-COMMENT ON COLUMN "app_ad_config"."link_url" IS '跳转链接';

poyi-app/src/main/resources/db/migration/V4.0_server_retry_record_create.sql

@@ -1,11 +0,0 @@
-CREATE TABLE "server_retry_record" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "record_key" varchar(128) NOT NULL UNIQUE,
-     "status" int2 default 0,
-     "create_time" timestamp,
-     PRIMARY KEY ("id")
-);
-
-
-COMMENT ON COLUMN "server_retry_record"."record_key" IS '记录唯一key';
-

poyi-app/src/main/resources/db/migration/V4.1_merchant_act_goods_create.sql

@@ -1,16 +0,0 @@
-CREATE TABLE "merchant_act_goods" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "type" varchar(128) default 'report_top',
-     "group_id" int4 NOT NULL,
-     "goods_id" int4 NOT NULL,
-     "status" int2 default 0,
-     "sort_value" int4 default 0,
-     "create_time" timestamp,
-     PRIMARY KEY ("id")
-);
-
-
-COMMENT ON COLUMN "merchant_act_goods"."type" IS '类型,默认:report_top,好卡';
-
-COMMENT ON COLUMN "merchant_act_goods"."sort_value" IS '排序值';
-

poyi-app/src/main/resources/db/migration/V4.2_merchant_act_goods_edit.sql

@@ -1,5 +0,0 @@
-ALTER TABLE "merchant_act_goods"
-    ADD COLUMN "like_num" int4,
-    ADD COLUMN "merchant_id" int4;
-
-COMMENT ON COLUMN "merchant_act_goods"."merchant_id" IS '商家id';

poyi-app/src/main/resources/db/migration/V4.3_questionnaire_new.sql

@@ -1,64 +0,0 @@
-ALTER TABLE "app_base_user"
-    ADD COLUMN "version" int4 default 0,
-    ADD COLUMN "daily_limit" int4 default 0,
-    ADD COLUMN "weekly_limit" int4 default 0,
-    ADD COLUMN "monthly_limit" int4 default 0;
-
-COMMENT ON COLUMN "app_base_user"."daily_limit" IS '每日限额提醒';
-COMMENT ON COLUMN "app_base_user"."weekly_limit" IS '每周限额提醒';
-COMMENT ON COLUMN "app_base_user"."monthly_limit" IS '每月限额';
-
-
-
-CREATE TABLE "questionnaire" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" varchar(64) default 'app',
-    "title" varchar(512) NOT NULL,
-    "description" text NOT NULL,
-    "status" int2 default 0,
-    "incr_amount" int4 default 1,
-    "create_time" timestamp,
-    PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "questionnaire"."incr_amount" IS '本次问卷提示额度,单位:万';
-
-
-CREATE TABLE "question" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" varchar(64) default 'text',
-    "questionnaire_id" int4 NOT NULL,
-    "question_text" text NOT NULL,
-    "question_choice_text" text,
-    "status" int2 default 0,
-    "create_time" timestamp,
-    PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "question"."type" IS '问题类型;选择题单选:choice_single,选择题多选:choice_multi,文字:text';
-COMMENT ON COLUMN "question"."question_choice_text" IS '选择题可选内容,json格式';
-
-CREATE TABLE "question_answer" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "questionnaire_id" int4 NOT NULL,
-    "question_id" int4 NOT NULL,
-    "user_id" int4 NOT NULL,
-    "answer_text" text NOT NULL,
-    "create_time" timestamp,
-    PRIMARY KEY ("id")
-);
-
-
-CREATE TABLE "user_limit_record" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" varchar(64) default 'questionnaire',
-    "user_id" int4 NOT NULL,
-    "previous_monthly_limit" int4 NOT NULL,
-    "new_monthly_limit" int4 NOT NULL,
-    "status" int2 default 0,
-    "create_time" timestamp,
-    "created_by" varchar(512) NOT NULL,
-    PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "user_limit_record"."type" IS '提额类型;问卷:questionnaire,人工:customer';

poyi-app/src/main/resources/db/migration/V4.4_questionnaire_edit.sql

@@ -1,17 +0,0 @@
-ALTER TABLE "questionnaire"
-    ADD COLUMN "daily_limit" int4 default 1,
-    ADD COLUMN "weekly_limit" int4 default 1;
-
-COMMENT ON COLUMN "questionnaire"."daily_limit" IS '每日限额提醒';
-COMMENT ON COLUMN "questionnaire"."weekly_limit" IS '每周限额提醒';
-
-
-ALTER TABLE "user_limit_record"
-    ADD COLUMN "previous_weekly_limit" int4 default 0,
-    ADD COLUMN "new_weekly_limit" int4 default 0,
-    ADD COLUMN "previous_daily_limit" int4 default 0,
-    ADD COLUMN "new_daily_limit" int4 default 0;
-
-
-
-

poyi-app/src/main/resources/db/migration/V4.5_questionnaire_edit.sql

@@ -1,8 +0,0 @@
-ALTER TABLE "questionnaire"
-    ADD COLUMN "member_level" int4 default 0;
-
-COMMENT ON COLUMN "questionnaire"."member_level" IS '会员等级';
-
-
-
-

poyi-app/src/main/resources/db/migration/V4.6_question_answer_edit.sql

@@ -1,8 +0,0 @@
-ALTER TABLE "question_answer"
-    ADD COLUMN "record_id" int4 default 0;
-
-COMMENT ON COLUMN "question_answer"."record_id" IS '记录id';
-
-
-
-

poyi-app/src/main/resources/db/migration/V4.7_app_user_detail_info.create.sql

@@ -1,20 +0,0 @@
-CREATE TABLE "app_user_detail_info" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "user_id" int4,
-     "sex" int2 default 0,
-     "birthday" varchar(255),
-     "interest" text,
-     "del_flag" int2 DEFAULT 0,
-     "create_time" timestamp(6),
-     "update_time" timestamp(6),
-     PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "app_user_detail_info"."interest" IS '兴趣爱好';
-COMMENT ON COLUMN "app_user_detail_info"."sex" IS '性别：默认0男，1女';
-COMMENT ON COLUMN "app_user_detail_info"."birthday" IS '生日';
-
-
-
-
-

poyi-app/src/main/resources/db/migration/V4.8_app_user_card_record.edit.sql

@@ -1,12 +0,0 @@
-ALTER TABLE "app_user_card_record"
-    ADD COLUMN "source_id" int4,
-    ADD COLUMN "source_type" varchar(255);
-
-COMMENT ON COLUMN "app_user_card_record"."source_id" IS '优惠券来源关联id';
-
-COMMENT ON COLUMN "app_user_card_record"."source_type" IS '优惠券来源关联类型';
-
-
-
-
-

poyi-app/src/main/resources/db/migration/V4.9_merchant_act_goods_edit.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "merchant_act_goods"
-    ADD COLUMN "common_sort" int4 DEFAULT 0;

poyi-app/src/main/resources/db/migration/V5.0_sale_code_update.sql

@@ -1,19 +0,0 @@
-
-ALTER TABLE "act_sale_code"
-    ADD COLUMN "order_id" int4,
-    ADD COLUMN "box_type" varchar(16),
-    ADD COLUMN "box_num" int4 DEFAULT 1;
-
-COMMENT ON COLUMN "act_sale_code"."box_type" IS '类型,箱:CARTON;盒:BOX';
-
-COMMENT ON COLUMN "act_sale_code"."box_num" IS '箱(盒)数';
-
-COMMENT ON COLUMN "act_sale_code"."order_id" IS '关联订单id';
-
-ALTER TABLE "sale_code_record"
-    ADD COLUMN "box_type" varchar(16),
-    ADD COLUMN "box_num" int4 DEFAULT 1;
-
-COMMENT ON COLUMN "sale_code_record"."box_type" IS '核销类型,箱:CARTON;盒:BOX';
-
-COMMENT ON COLUMN "sale_code_record"."box_num" IS '核销箱(盒)数';

poyi-app/src/main/resources/db/migration/V5.1_py_erp_random_code_update.sql

@@ -1,20 +0,0 @@
-ALTER TABLE "py_erp_random_code"
-    ADD COLUMN "list_id"      int4,
-    ADD COLUMN "sets_version" varchar(255);
-
-CREATE INDEX "pr_r_c_list_id" ON "py_erp_random_code" USING btree (
-                                                                   "list_id" "pg_catalog"."int4_ops" ASC NULLS LAST
-    );
-
-COMMENT ON COLUMN "py_erp_random_code"."list_id" IS '拼团listid';
-
-COMMENT ON COLUMN "py_erp_random_code"."sets_version" IS '系列版本';
--- act_sale_code
-ALTER TABLE "act_sale_code"
-    ADD COLUMN "list_id" int4;
-
-CREATE INDEX "gsc-list-id" ON "act_sale_code" USING btree (
-                                                           "list_id" "pg_catalog"."int4_ops" ASC NULLS LAST
-    );
-
-COMMENT ON COLUMN "act_sale_code"."list_id" IS '拼团list id';

poyi-app/src/main/resources/db/migration/V5.2_act_sale_code_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "act_sale_code"
-    ADD COLUMN "sets_version" varchar(255);
-
-COMMENT ON COLUMN "act_sale_code"."sets_version" IS 'checklist系列版本';

poyi-app/src/main/resources/db/migration/V5.3_sale_code_update.sql

@@ -1,7 +0,0 @@
-
-ALTER TABLE "act_sale_code"
-    ADD COLUMN "code_pub" varchar(16);
-
-COMMENT ON COLUMN "act_sale_code"."code_pub" IS '另一对code';
-
-

poyi-app/src/main/resources/db/migration/V5.4_statistics_tables_create.sql

@@ -1,62 +0,0 @@
--- 统计表
--- ----------------------------
-CREATE TABLE "t_stats_data" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" varchar(64) ,
-    "collection_user_id" int4,
-    "collection_type_id" int4,
-    "collection_num" numeric(18,2),
-    "name" text,
-    "remark" text ,
-    "status" int4 default 0,
-    "create_time" timestamp(6),
-    "update_time" timestamp(6),
-    "prop1" text ,
-    "prop2" text ,
-    "version" int4 default 0,
-    primary key ("id")
-)
-;
-COMMENT ON COLUMN "t_stats_data"."collection_user_id" IS '统计用户id';
-COMMENT ON COLUMN "t_stats_data"."collection_type_id" IS '统计类型id';
-COMMENT ON COLUMN "t_stats_data"."collection_num" IS '统计总数';
-COMMENT ON COLUMN "t_stats_data"."remark" IS '备注';
-COMMENT ON COLUMN "t_stats_data"."type" IS '类型,商家';
-COMMENT ON TABLE "t_stats_data" IS '统计表';
-
-CREATE INDEX "t_stats_data_type_id" ON "t_stats_data" USING btree (
-    type,collection_user_id,collection_type_id
-    );
-
--- ----------------------------
--- Table structure for t_stats_record
---统计记录子表
--- ----------------------------
-CREATE TABLE "t_stats_record" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" varchar(64) ,
-    "collection_user_id" int4,
-    "collection_type_id" int4,
-    "ref_user_id" int4,
-    "status" int4 default 0,
-    "num" numeric(18,2) default 1,
-    "extra_prop" text,
-    "remark" text,
-    "create_time" timestamp(6),
-    "prop1" text ,
-    "version" int4 default 0,
-     primary key ("id")
-);
-
-COMMENT ON COLUMN "t_stats_record"."type" IS '类型';
-COMMENT ON COLUMN "t_stats_record"."collection_user_id" IS '汇总用户id';
-COMMENT ON COLUMN "t_stats_record"."collection_type_id" IS '统计数据来源id';
-COMMENT ON COLUMN "t_stats_record"."ref_user_id" IS '记录来源用户id';
-COMMENT ON COLUMN "t_stats_record"."num" IS '数量';
-COMMENT ON COLUMN "t_stats_record"."extra_prop" IS '额外参数';
-COMMENT ON COLUMN "t_stats_record"."remark" IS '备注';
-COMMENT ON TABLE "t_stats_record" IS '统计表明细';
-
-CREATE INDEX "t_stats_record_type_id" ON "t_stats_record" USING btree (
-     type,collection_user_id,collection_type_id
-    );

poyi-app/src/main/resources/db/migration/V5.5_refund_review_edit.sql

@@ -1,13 +0,0 @@
-ALTER TABLE"card_group_order_review"
-    ADD COLUMN "check_type" varchar(32),
-    ADD COLUMN "check_remark" text,
-    ADD COLUMN "record_prop" text,
-    ADD COLUMN "group_lock_time" timestamp(0);
-
-COMMENT ON COLUMN"card_group_order_review"."check_type" IS '运营审核类型,初审拒绝:3;初审通过-拼团锁定24小时:4;初审通过-拼团锁定:5';
-
-COMMENT ON COLUMN"card_group_order_review"."group_lock_time" IS '拼团锁定截止时间';
-
-COMMENT ON COLUMN"card_group_order_review"."check_remark" IS '初审备注,json,';
-
-COMMENT ON COLUMN"card_group_order_review"."record_prop" IS '退款记录信息,json';

poyi-app/src/main/resources/db/migration/V5.6_card_group_lives_config_edit.sql

@@ -1,26 +0,0 @@
-ALTER TABLE "public"."card_group_lives_config"
-  ADD COLUMN "live_like_num" int4 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."card_group_lives_config"."live_like_num" IS '直播间点赞总数';
-
-CREATE TABLE "public"."card_group_lives_like" (
-  "id" INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-  "code" varchar(255),
-  "like_num" int4,
-  "merchant_id" int4,
-  "user_id" int4,
-  "type" varchar(255)
-)
-;
-
-COMMENT ON COLUMN "public"."card_group_lives_like"."id" IS 'id';
-
-COMMENT ON COLUMN "public"."card_group_lives_like"."code" IS '直播间code';
-
-COMMENT ON COLUMN "public"."card_group_lives_like"."like_num" IS '点赞总数';
-
-COMMENT ON COLUMN "public"."card_group_lives_like"."merchant_id" IS '商家id';
-
-COMMENT ON COLUMN "public"."card_group_lives_like"."user_id" IS '用户id';
-
-COMMENT ON COLUMN "public"."card_group_lives_like"."type" IS '直播类型: 商城/拼团';

poyi-app/src/main/resources/db/migration/V5.7_user_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_base_user"
-    ADD COLUMN "live_anonymous" int2 default 0;
-
-COMMENT ON COLUMN "app_base_user"."live_anonymous" IS '直播间匿名观看';

poyi-app/src/main/resources/db/migration/V5.8_app_share_config_create.sql

@@ -1,16 +0,0 @@
-CREATE TABLE "public"."app_share_config" (
-  "id"  INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-  "refId" int4 NOT NULL,
-  "type" varchar(255),
-  "config" json,
-  "updateTime" date
-)
-;
-
-COMMENT ON COLUMN "public"."app_share_config"."refId" IS '分享id';
-
-COMMENT ON COLUMN "public"."app_share_config"."type" IS '分享类别';
-
-COMMENT ON COLUMN "public"."app_share_config"."config" IS 'json格式内容';
-
-COMMENT ON COLUMN "public"."app_share_config"."updateTime" IS '更新时间';

poyi-app/src/main/resources/db/migration/V5.9_app_user_invoice_edit.sql

@@ -1,3 +0,0 @@
-ALTER TABLE app_user_invoice
-    ADD COLUMN default_flag BOOLEAN DEFAULT FALSE,
-    ADD COLUMN invoice_type VARCHAR(50);

poyi-app/src/main/resources/db/migration/V6.0_app_new_user_tasks_create.sql

@@ -1,17 +0,0 @@
-CREATE TABLE "app_new_user_tasks" (
-                                        "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-                                        "user_id" int4,
-                                        "type" varchar(255),
-                                        "status" int2,
-                                        "create_time" timestamp(6),
-                                        "update_time" timestamp(6),
-                                        PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "app_new_user_tasks"."type" IS '任务类型：guide 新手引导、register_gift_250401 新手注册礼包';
-COMMENT ON COLUMN "app_new_user_tasks"."status" IS '是否完成新手任务：默认0未完成，1已完成';
-
-
-
-
-

poyi-app/src/main/resources/db/migration/V6.1_member_user_relation_edit.sql

@@ -1,8 +0,0 @@
-ALTER TABLE "member_user_relation"
-    ADD COLUMN "logout_time" timestamp;
-
-COMMENT ON COLUMN "member_user_relation"."logout_time" IS '注销时间';
-
-
-
-

poyi-app/src/main/resources/db/migration/V6.2_app_user_business_settled_edit.sql

@@ -1,12 +0,0 @@
-ALTER TABLE "app_user_business_settled"
-    ADD COLUMN "pro_anchor" int2,
-    ADD COLUMN "rec_channle" varchar(255),
-    ADD COLUMN "play_sales" varchar(255);
-
-COMMENT ON COLUMN "app_user_business_settled"."pro_anchor" IS '是否有专业拆卡主播';
-COMMENT ON COLUMN "app_user_business_settled"."rec_channle" IS '进货货源渠道';
-COMMENT ON COLUMN "app_user_business_settled"."play_sales" IS '售卖玩法内容';
-
-
-
-

poyi-app/src/main/resources/db/migration/V6.3_app_user_business_settled_edit.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_user_business_settled"
-    ADD COLUMN "verify_status" int2 default 0;
-
-COMMENT ON COLUMN "app_user_business_settled"."verify_status" IS '审核状态：0未审核、1已审核 2、审核不通过';

poyi-app/src/main/resources/db/migration/V6.4_app_account_update.sql

@@ -1,4 +0,0 @@
-ALTER TABLE "app_account"
-    ADD COLUMN if not exists "dialling_code" varchar(255);
-
-COMMENT ON COLUMN "app_account"."dialling_code" IS '手机区号';

poyi-app/src/main/resources/db/migration/V6.5_brand_member_discount_record_create.sql

@@ -1,28 +0,0 @@
-ALTER TABLE "card_group_info"
-    ADD COLUMN "use_member_discount" int2 default 0;
-
-COMMENT ON COLUMN "card_group_info"."use_member_discount" IS '参与会员折扣：默认0不参与 平台会员折扣 1 品牌会员折扣 2';
-
-CREATE TABLE "brand_member_discount_record" (
-    "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-    "type" varchar(255),
-    "order_id" int8,
-    "discount" numeric(18,2),
-    "discount_amount" numeric(18,2),
-    "merchant_group_id" int8,
-    "status" int2,
-    "create_time" timestamp(6),
-    PRIMARY KEY ("id")
-);
-
-COMMENT ON COLUMN "brand_member_discount_record"."type" IS '折扣类型: common 品牌会员常规折扣';
-COMMENT ON COLUMN "brand_member_discount_record"."order_id" IS '订单id';
-COMMENT ON COLUMN "brand_member_discount_record"."discount" IS '折扣率';
-COMMENT ON COLUMN "brand_member_discount_record"."discount_amount" IS '折扣金额';
-COMMENT ON COLUMN "brand_member_discount_record"."merchant_group_id" IS '品牌id';
-COMMENT ON COLUMN "brand_member_discount_record"."status" IS '状态：101已支付、205退款完成';
-
-
-
-
-

poyi-app/src/main/resources/db/migration/V6.6_app_account_add_region_code.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."app_account"
-  ALTER COLUMN "dialling_code" SET DEFAULT '86';

poyi-app/src/main/resources/db/migration/V6.7_app_user_win_card_index.sql

@@ -1 +0,0 @@
-CREATE INDEX idx_app_user_win_card_group_goods_id ON app_user_win_card(group_goods_id);

poyi-app/src/main/resources/db/migration/V6.9_app_account_update.sql

@@ -1,2 +0,0 @@
-ALTER TABLE "public"."app_account"
-    ALTER COLUMN "dialling_code" DROP DEFAULT;

poyi-app/src/main/resources/db/migration/V7.0_group_info_order_edit.sql

@@ -1,10 +0,0 @@
-ALTER TABLE "public"."card_group_info"
-  ADD COLUMN "merchant_open" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."card_group_info"."merchant_open" IS '支持商家代开卡密:默认0不支持，1支持';
-
-
-ALTER TABLE "public"."card_group_order_info"
-  ADD COLUMN "merchant_open" int2 DEFAULT 0;
-
-COMMENT ON COLUMN "public"."card_group_order_info"."merchant_open" IS '支持商家代开卡密:默认0不支持，1支持';

poyi-app/src/main/resources/db/migration/V7.1_app_user_browse_record_create.sql

@@ -1,30 +0,0 @@
-CREATE TABLE "app_user_browse_record" (
-                                          "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-                                          "type" varchar(255),
-                                          "item_id" int8,
-                                          "user_id" int8,
-                                          "browse_time" timestamp,
-                                          "browse_date" date,
-                                          "source_type" varchar(255),
-                                          "extra_info" varchar(255),
-                                          "merchant_id" int8,
-                                          "create_time" timestamp,
-                                          PRIMARY KEY ("id")
-);
-
-CREATE INDEX idx_user_browse_user_id ON app_user_browse_record (user_id);
-CREATE UNIQUE INDEX unique_user_item_type ON app_user_browse_record (user_id, item_id, type);
-
-COMMENT ON COLUMN "app_user_browse_record"."type" IS '类型: group 拼团、goods 商品、shop 店铺';
-COMMENT ON COLUMN "app_user_browse_record"."item_id" IS '拼团/商品/店铺id';
-COMMENT ON COLUMN "app_user_browse_record"."user_id" IS '用户id';
-COMMENT ON COLUMN "app_user_browse_record"."browse_time" IS '浏览时间';
-COMMENT ON COLUMN "app_user_browse_record"."browse_date" IS '浏览日期';
-COMMENT ON COLUMN "app_user_browse_record"."source_type" IS '浏览来源';
-COMMENT ON COLUMN "app_user_browse_record"."merchant_id" IS '商家id';
-COMMENT ON COLUMN "app_user_browse_record"."extra_info" IS '扩展字段';
-
-
-
-
-

poyi-app/src/main/resources/db/migration/V7.2_app_user_win_card_index_create.sql

@@ -1 +0,0 @@
-CREATE INDEX CONCURRENTLY idx_user_del_order_group ON app_user_win_card(user_id, del_flag, order_id DESC, group_goods_id);

poyi-app/src/main/resources/db/migration/V7.3_app_user_point_record_index_create.sql

@@ -1,2 +0,0 @@
-CREATE INDEX CONCURRENTLY idx_app_user_point_record_type_time_uid
-ON app_user_point_record(type, create_time, user_id);

poyi-app/src/main/resources/db/migration/v3.3_group_sale_code.sql

@@ -1,42 +0,0 @@
-CREATE TABLE "act_sale_code" (
-     "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-     "merchant_id" int4 NOT NULL,
-     "panini_base_id" int4 NOT NULL,
-     "code" varchar(64),
-     "remark" text,
-     "status" int4 DEFAULT 0,
-     "create_time" timestamp,
-     PRIMARY KEY ("id")
-);
-
-
-CREATE INDEX "gsc-mid-pid" ON "act_sale_code" USING btree (
-    "merchant_id","panini_base_id"
-);
-
-CREATE INDEX "gsc-code" ON "act_sale_code" USING btree ( "code" );
-
-
-CREATE TABLE "sale_code_record" (
-   "id" int4 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
-   "type" varchar(32) DEFAULT 'group',
-   "ref_id" int4 NOT NULL,
-   "code_id" int4 NOT NULL,
-   "code" varchar(64),
-   "img" text,
-   "verify_time" timestamp,
-   "status" int4 DEFAULT 0,
-   "remark" text,
-   "create_time" timestamp,
-   PRIMARY KEY ("id")
-);
-
-CREATE INDEX "gcr-cid-gid" ON "sale_code_record" USING btree (
-     "type","ref_id","code_id"
-);
-
-COMMENT ON COLUMN "sale_code_record"."type" IS '类型:默认拼团:group';
-
-COMMENT ON COLUMN "sale_code_record"."ref_id" IS '关联商品id,根据type判断';
-
-COMMENT ON COLUMN "sale_code_record"."status" IS '状态:默认0:绑定,1:已核销';

poyi-app/src/test/java/com/poyee/AppOrderTest.java

@@ -1,116 +0,0 @@
-package com.poyee;
-
-import com.tzy.PoyiApplication;
-import com.tzy.common.utils.DateUtils;
-import com.tzy.pojo.card.CardGroupGoods;
-import com.tzy.pojo.card.CardGroupOrderInfo;
-import com.tzy.sportcard.api.mapper.MineApiMapper;
-import com.tzy.sportcard.api.service.AsyncAppService;
-import com.tzy.sportcard.group.mapper.TzyMerchantInfoMapper;
-import com.tzy.sportcard.group.service.ICardGroupOrderInfoService;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.teasoft.bee.osql.Op;
-import org.teasoft.bee.osql.PreparedSql;
-import org.teasoft.bee.osql.SuidRich;
-import org.teasoft.honey.osql.core.ConditionImpl;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-@Slf4j
-@SpringBootTest(classes = PoyiApplication.class)
-@RunWith(SpringRunner.class)
-class AppOrderTest {
-
-	@Resource
-	private TzyMerchantInfoMapper tzyMerchantInfoMapper;
-	@Autowired
-	private ICardGroupOrderInfoService orderInfoService;
-	@Autowired
-	private PreparedSql preparedSql;
-	@Resource
-	private MineApiMapper mineApiMapper;
-	@Autowired
-	private SuidRich suidRich;
-	@Autowired
-	private AsyncAppService asyncAppService;
-	@Test
-	public void merchantOrderNotice() {
-		com.tzy.sportcard.group.domain.CardGroupOrderInfo orderInfo = new com.tzy.sportcard.group.domain.CardGroupOrderInfo();
-		orderInfo.setId(23542L);
-		orderInfo.setMerchantId(13L);
-		orderInfo.setAppUserNickName("yu");
-		asyncAppService.sendMerchantNotice(orderInfo);
-	}
-	@Test
-	public void testQueryIn() {
-		ConditionImpl condition = new ConditionImpl();
-		List<Integer> ids = new ArrayList<>();
-		ids.add(346920);
-		ids.add(346921);
-		condition.op("id", Op.in,ids);
-		CardGroupGoods goods = new CardGroupGoods();
-		//goods.setLockStatus(1);
-		//int update = suidRich.update(goods,condition);
-		//System.out.println(update);
-		List<CardGroupGoods> select = suidRich.select(goods, condition);
-		System.out.println(select);
-	}
-
-	@Test
-	public void testPickUpOrder() {
-		CardGroupOrderInfo condition = new CardGroupOrderInfo();
-		condition.setUserId(179L);
-		//组团下所有中卡订单全部改为自提
-		//自提确认收货 即代表订单完成
-		condition.setGroupInfoId(547L);
-		condition.setStatus(103L);
-		CardGroupOrderInfo updateInfo = new CardGroupOrderInfo();
-		updateInfo.setStatus(301L);
-		updateInfo.setPickUpType("1");
-		updateInfo.setShipTime(DateUtils.getTimestampNow());
-		suidRich.update(condition,updateInfo);
-	}
-
-
-	@Test
-	public void tesCheckOrder() {
-		String[] orderIds = "20095,20941".split(",");
-		orderInfoService.checkIsWaitShipping(orderIds);
-
-	}
-
-	@Test
-	public void testreturnId() {
-		com.tzy.sportcard.group.domain.CardGroupOrderInfo order = new com.tzy.sportcard.group.domain.CardGroupOrderInfo();
-		order.setGroupInfoId(455L);
-		order.setActualPayment(BigDecimal.TEN);
-		long id = orderInfoService.insertCardGroupOrderInfo(order);
-		System.out.println(id);
-	}
-
-	//public static void main(String[] args) {
-	//	List<CardGroupOrderInfo> orders=new ArrayList<>();
-	//	CardGroupOrderInfo order1 = new CardGroupOrderInfo();
-	//	order1.setUserId(1L);
-	//	CardGroupOrderInfo order2 = new CardGroupOrderInfo();
-	//	order2.setUserId(2L);
-	//	CardGroupOrderInfo order3 = new CardGroupOrderInfo();
-	//	order3.setUserId(2L);
-	//	orders.add(order1);
-	//	orders.add(order2);
-	//	orders.add(order3);
-	//	Map<Long, CardGroupOrderInfo> distinctUserOrders = orders.stream().collect(Collectors.toMap(CardGroupOrderInfo::getUserId, u -> u,(key1, key2) -> key1));
-	//	System.out.println(distinctUserOrders.size());
-	//}
-
-
-
-}

poyi-app/src/test/java/com/poyee/AppUserTest.java

@@ -1,129 +0,0 @@
-package com.poyee;
-
-import com.tzy.PoyiApplication;
-import com.tzy.common.constant.Constants;
-import com.tzy.common.utils.DateUtils;
-import com.tzy.dto.ImUserDTO;
-import com.tzy.framework.util.RedisUtils;
-import com.tzy.sportcard.api.domain.AppUserInfoDto;
-import com.tzy.sportcard.api.dto.prize.AppActPrizeDTO;
-import com.tzy.sportcard.api.mapper.MineApiMapper;
-import com.tzy.sportcard.api.service.GroupApiService;
-import com.tzy.sportcard.api.service.MineApiService;
-import com.tzy.sportcard.group.mapper.CardGroupOrderInfoMapper;
-import com.tzy.sportcard.group.mapper.TzyMerchantInfoMapper;
-import com.tzy.sportcard.group.service.AppActService;
-import com.tzy.sportcard.group.service.ICardGroupLivesConfigService;
-import com.tzy.sportcard.point.domain.AppUserPointRecord;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.teasoft.bee.osql.PreparedSql;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Slf4j
-@SpringBootTest(classes = PoyiApplication.class)
-@RunWith(SpringRunner.class)
-class AppUserTest {
-
-	@Resource
-	private TzyMerchantInfoMapper tzyMerchantInfoMapper;
-	@Resource
-	private CardGroupOrderInfoMapper cardGroupOrderInfoMapper;
-	@Autowired
-	private GroupApiService groupApiService;
-	@Autowired
-	private PreparedSql preparedSql;
-	@Resource
-	private MineApiMapper mineApiMapper;
-	@Autowired
-	private MineApiService mineApiService;
-	@Autowired
-	private AppActService appActService;
-	@Resource
-	private RedisUtils redisUtils;
-	@Resource
-	private ICardGroupLivesConfigService livesConfigService;
-
-	@Test
-	public void tesLiveUser() {
-		List<ImUserDTO> users = livesConfigService.findLivingRoomUser(13, Arrays.asList(15596,2442), false, 1, 200);
-		log.info("查询到用户:{}",users.size());
-	}
-
-
-	private AppUserInfoDto getUserInfo(){
-		AppUserInfoDto appUserInfo = new AppUserInfoDto();
-		// account id
-		appUserInfo.setId(236);
-		List<AppUserInfoDto> appUserInfoDtos = mineApiMapper.searchUserBaseInfo(appUserInfo);
-		return appUserInfoDtos.get(0);
-	}
-
-
-	@Test
-	public void tesDrawPrize() {
-		AppUserInfoDto userInfo = getUserInfo();
-		int i=0;
-		List<AppActPrizeDTO> drawPrizeList = new ArrayList<>();
-		while(true) {
-			if(i>50){
-				break;
-			}
-			AppActPrizeDTO drawPrize = appActService.drawPrize(1, userInfo,null);
-			drawPrizeList.add(drawPrize);
-			//log.info("本次抽到:{}",drawPrize.getName());
-			i++;
-		}
-		Map<String, List<AppActPrizeDTO>> map = drawPrizeList.stream().collect(Collectors.groupingBy(AppActPrizeDTO::getName));
-		map.entrySet().forEach(entry -> log.info("抽奖类型:{},次数:{}",entry.getKey(),entry.getValue().size()));
-	}
-
-	@Test
-	public void tesUserPoint() {
-		AppUserPointRecord pointRecord = new AppUserPointRecord();
-		//pointRecord.setType(Constants.POINT_TYPE_GOODS);
-		//pointRecord.setChangePoint(1);
-		//pointRecord.setUserId(2457L);
-		//pointRecord.setOrderId(22788L);
-		//pointRecord.setOrderNo("SO892022062820626522");
-		pointRecord.setType(Constants.POINT_TYPE_USER_GROWTH);
-		pointRecord.setChangePoint(200000L);
-		pointRecord.setUserId(2442L);
-		pointRecord.setOrderId(106223L);
-		pointRecord.setOrderNo("SO782023032713209871");
-		pointRecord.setMerchantId(86L);
-		mineApiService.addUserPoint(pointRecord);
-	}
-
-
-	@Test
-	public void tesUserQuery() {
-		AppUserInfoDto appUserInfo = new AppUserInfoDto();
-		appUserInfo.setPhone("15618709098");
-		List<AppUserInfoDto> appUserInfoDtos = mineApiMapper.searchUserBaseInfo(appUserInfo);
-		System.out.println(appUserInfoDtos);
-	}
-
-	@Test
-	public void tesUserRedis() {
-		String day = DateUtils.dateTime();
-		String key = Constants.MERCHANT_USER_ORDER_NUM + day + 11;
-		redisUtils.hset(key, "1", 1);
-		redisUtils.expire(key, Constants.dayForSecond);
-	}
-
-
-
-
-
-}

poyi-app/src/test/java/com/poyee/BaseTest.java

@@ -1,51 +0,0 @@
-package com.poyee;
-
-import com.tzy.common.dto.InDto;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * @author by po'yi
- * @Classname BaseTest
- * @Description TODO
- * @Date 2022/11/14 19:12
- */
-public class BaseTest {
-
-	/**
-	 * 构建2442用户参数
-	 * @param data
-	 * @return
-	 */
-	protected InDto buildUserIndto(Map<String, Object> data){
-		InDto inDto = new InDto();
-		inDto.setData(data);
-		inDto.setUserType("userType");
-		inDto.setAppid("wx22a7349c29e688d4");
-		inDto.setUnionid("oAbrM6qK1qZO4PbvMLREcAR60JZQ");
-		inDto.setUsername("15618709098");
-		inDto.setVersion("1.7.38");
-		inDto.setDepartId(103);
-		inDto.setTimestamp(new Date().getTime());
-		return inDto;
-	}
-
-	/**
-	 * 构建13号商家参数
-	 * @param data
-	 * @return
-	 */
-	protected InDto buildMerchantIndto(Map<String, Object> data){
-		InDto inDto = new InDto();
-		inDto.setData(data);
-		inDto.setUserType("WX_AUTH");
-		inDto.setAppid("wx22a7349c29e688d4");
-		inDto.setUnionid("oAbrM6qK1qZO4PbvMLREcAR60JZQ");
-		inDto.setUsername("13071005103");
-		inDto.setVersion("1.6.38");
-		inDto.setDepartId(103);
-		inDto.setTimestamp(new Date().getTime());
-		return inDto;
-	}
-}

poyi-app/src/test/java/com/poyee/ExamTest.java

@@ -1,96 +0,0 @@
-package com.poyee;
-
-import com.tzy.PoyiApplication;
-import com.tzy.framework.util.RedisTools;
-import com.tzy.framework.util.RedisUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.teasoft.bee.osql.PreparedSql;
-import org.teasoft.bee.osql.SuidRich;
-
-import java.util.concurrent.TimeUnit;
-
-
-@Slf4j
-@SpringBootTest(classes = PoyiApplication.class)
-@RunWith(SpringRunner.class)
-class ExamTest {
-
-
-	@Autowired
-	private SuidRich suidRich;
-	@Autowired
-	private PreparedSql preparedSql;
-
-
-	@Test
-	public void testBatchInsert(){
-		//List<TestData> list = new ArrayList<>();
-		//for(int i = 0; i <5;i++){
-		//	list.add(new TestData(null,"name"+i));
-		//}
-		//suidRich.insert(list);
-		//long id = suidRich.insertAndReturnId(new TestData(null, "name2022"), IncludeType.INCLUDE_EMPTY);
-		//System.out.println(id);
-	}
-
-	@Test
-	public void testUpdate(){
-		String sql="update sku set sku_stock=sku_stock-? where id =?";
-		preparedSql.modify(sql,new Object[]{1,2});
-	}
-
-
-	@Test
-	public void testQuerySqlRoom() {
-
-		int i=0;
-		while (true) {
-			i++;
-			new Thread(){
-				@Override
-				public void run() {
-					lock();
-				}
-			}.start();
-
-			if(i>1){
-				break;
-			}
-		}
-		System.out.println("-------end-----");
-	}
-
-	private void lock(){
-		RedisUtils redisUtils = RedisTools.getRedisUtils();
-			boolean isLock;
-			try {
-				isLock = redisUtils.tryLock("REDLOCK_KEY", TimeUnit.MILLISECONDS,15L );
-				if (isLock) {
-					Thread.sleep(16000);
-					log.info("-----------111------22222"+Thread.currentThread().getName());
-					redisUtils.unlock("REDLOCK_KEY");
-				}
-			} catch (Exception e) {
-				log.info("异常:{}",e);
-			} finally {
-				// 无论如何, 最后都要解锁
-				try {
-					redisUtils.unlock("REDLOCK_KEY");
-				}catch (Exception e){
-					log.info("异常:{}",e);
-				}
-				System.out.println("释放锁");
-			}
-		}
-
-
-
-
-
-
-}

poyi-app/src/test/java/com/poyee/GroupInfoTest.java

@@ -1,89 +0,0 @@
-package com.poyee;
-
-import com.alibaba.fastjson.JSONObject;
-import com.tzy.PoyiApplication;
-import com.tzy.common.constant.MqConstans;
-import com.tzy.common.exception.AppAssert;
-import com.tzy.common.utils.DateUtils;
-import com.tzy.elasticsearch.dto.CardGroupInfoGoodsDTO;
-import com.tzy.sportcard.api.dto.ResourceData;
-import com.tzy.sportcard.api.service.GroupApiService;
-import com.tzy.sportcard.group.domain.CardGroupOrderInfo;
-import com.tzy.sportcard.group.domain.TzyMerchantInfo;
-import com.tzy.sportcard.group.mapper.CardGroupOrderInfoMapper;
-import com.tzy.sportcard.group.mapper.TzyMerchantInfoMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.teasoft.bee.osql.PreparedSql;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Slf4j
-@SpringBootTest(classes = PoyiApplication.class)
-@RunWith(SpringRunner.class)
-class GroupInfoTest {
-
-	@Resource
-	private TzyMerchantInfoMapper tzyMerchantInfoMapper;
-	@Resource
-	private CardGroupOrderInfoMapper cardGroupOrderInfoMapper;
-	@Autowired
-	private GroupApiService groupApiService;
-	@Autowired
-	private PreparedSql preparedSql;
-
-	@Autowired
-	private RabbitTemplate rabbitTemplate;
-
-	@Test
-	public void testGroupEsSync() {
-		//同步es数据
-		CardGroupInfoGoodsDTO param = new CardGroupInfoGoodsDTO().setSyncType(CardGroupInfoGoodsDTO.SYNC_TYPE_EDIT).setGroupInfoId(1447L)
-		.setSoldTimeEnd(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, new Date())).setStatus("203");
-		rabbitTemplate.convertAndSend(MqConstans.EXCHANGE_GROUP_GOODS_SYNC_ES, MqConstans.ROUTING_KEY_GROUP_GOODS_SYNC_ES, JSONObject.toJSONString(param));
-	}
-
-	@Test
-	public void testNull() {
-		TzyMerchantInfo merchantInfo=null;
-		AppAssert.notNull(merchantInfo,"null");
-	}
-
-	@Test
-	public void testTeamGoods() {
-		int count = groupApiService.selectOrderCountByTeam(638, "独行侠", false);
-		System.out.println(count);
-	}
-
-	@Test
-	public void testCallBack()  {
-		String no ="GU120220309508294129";
-		callBack(no);
-	}
-
-	private void callBack(String no) {
-		CardGroupOrderInfo orderInfo = cardGroupOrderInfoMapper.getByOrderNo(no);
-		ResourceData resourceData=new ResourceData();
-		resourceData.setOut_trade_no(no);
-		resourceData.setTrade_type(orderInfo.getPaymentType());//支付类型
-		resourceData.setTransaction_id(String.valueOf(new Date().getTime()));//支付流水号，微信支付订单号
-		resourceData.setSuccess_time(DateUtils.dateTime(new Date()));//支付成功时间
-		resourceData.setTrade_state("TRADE_SUCCESS");//支付状态
-		resourceData.setTrade_state_desc("TRADE_SUCCESS");//支付状态说明
-		resourceData.setBank_type("支付宝");//付款银行
-		ResourceData.PayAmount payAmount = new ResourceData.PayAmount();
-		payAmount.setTotal(orderInfo.getActualPayment().multiply(new BigDecimal(100)).intValue());
-		payAmount.setPayer_total(payAmount.getTotal());
-		resourceData.setAmount(payAmount);
-		groupApiService.paymentResult(resourceData);
-	}
-
-
-}

poyi-app/src/test/java/com/poyee/LivingTest.java

@@ -1,67 +0,0 @@
-package com.poyee;
-
-import com.tzy.PoyiApplication;
-import com.tzy.common.config.QuerySql;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.teasoft.bee.osql.PreparedSql;
-import org.teasoft.bee.osql.SuidRich;
-import org.teasoft.honey.osql.core.Logger;
-
-
-@Slf4j
-@SpringBootTest(classes = PoyiApplication.class)
-@RunWith(SpringRunner.class)
-class LivingTest {
-
-
-	@Autowired
-	private SuidRich suidRich;
-	@Autowired
-	private PreparedSql preparedSql;
-
-	@Test
-	public void testQuerySqlRoom() {
-		String sql="SELECT l.code,info.merchant_id FROM card_group_lives_config l LEFT JOIN card_group_info info on l.group_info_id=info.id \n" +
-				"WHERE info.id=618 and del_flg=0";
-		//String s = preparedSql.selectJson(sql);
-		//System.out.println(s);
-
-		String sql2 = QuerySql.getQuerySql("osql.example.entity.selectOrdersViaMap");
-		Logger.info("getCustomSql:  " + sql2);
-	}
-
-	//@Test
-	//public void testInsertRoomChat() {
-	//	RoomChat roomChat = new RoomChat();
-	//	roomChat.setRoomId(618L);
-	//	roomChat.setNickName("yu2");
-	//	roomChat.setMsg("test21");
-	//	roomChat.setCreateTime(Timestamp.valueOf(LocalDateTime.now()));
-	//	suidRich.insert(roomChat);
-	//	System.out.println(roomChat.toString());
-	//}
-	//
-	//@Test
-	//public void testSelectRoomChat() {
-	//
-	//	RoomChat roomChat = new RoomChat();
-	//	Condition beeCondition=new ConditionImpl();
-	//	beeCondition.start(0).size(10)
-	//			.op("createTime", Op.ge, Timestamp.valueOf("2022-03-01 15:40:00"))
-	//			.op("createTime", Op.le, Timestamp.valueOf("2022-03-01 15:55:00"))
-	//			//.between("createTime", Timestamp.valueOf("2022-03-01 15:30:00"),Timestamp.valueOf("2022-03-01 15:40:00"))
-	//			.op("roomId", Op.eq,618L);
-	//	List<RoomChat> list = suidRich.select(roomChat,beeCondition);
-	//	System.out.println(list);
-	//}
-
-
-
-
-
-}

poyi-app/src/test/java/com/poyee/MerchantInfoTest.java

@@ -1,91 +0,0 @@
-package com.poyee;
-
-import com.alibaba.fastjson.JSONObject;
-import com.tzy.PoyiApplication;
-import com.tzy.common.utils.DateUtils;
-import com.tzy.common.utils.bean.JSONTools;
-import com.tzy.sportcard.api.dto.ResourceData;
-import com.tzy.sportcard.api.service.GroupApiService;
-import com.tzy.sportcard.group.domain.CardGroupOrderInfo;
-import com.tzy.sportcard.group.domain.TzyMerchantInfo;
-import com.tzy.sportcard.group.mapper.CardGroupOrderInfoMapper;
-import com.tzy.sportcard.group.mapper.TzyMerchantInfoMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.*;
-
-@Slf4j
-@SpringBootTest(classes = PoyiApplication.class)
-@RunWith(SpringRunner.class)
-class MerchantInfoTest {
-
-	@Resource
-	private TzyMerchantInfoMapper tzyMerchantInfoMapper;
-	@Resource
-	private CardGroupOrderInfoMapper cardGroupOrderInfoMapper;
-	@Autowired
-	private GroupApiService groupApiService;
-
-
-	@Test
-	public void tesMerchant() {
-		TzyMerchantInfo merchantInfo = new TzyMerchantInfo();
-		merchantInfo.setId(13L);
-		//merchantInfo.setCheckStatus(1);
-		//merchantInfo.setLiveType("work_wx");
-		//merchantInfo.setWorkWechatAuth("yu");
-		//List<LivingAuthDTO> data = new ArrayList<>();
-		//data.add(new LivingAuthDTO(179,"summer"));
-		//data.add(new LivingAuthDTO(172,"yu"));
-		//merchantInfo.setLivingAuthConfig(JSONTools.obj2json(data));
-		tzyMerchantInfoMapper.updateMerchantAuth(merchantInfo);
-	}
-
-	@Test
-	public void tesMerchantRyAuth() {
-		TzyMerchantInfo merchantInfo = tzyMerchantInfoMapper.selectTzyMerchantInfoById(13L);
-		String livingAuthConfig = merchantInfo.getLivingAuthConfig();
-		List<JSONObject> livingAuthDTOS = JSONTools.jsonStr2obj(livingAuthConfig, List.class);
-		List<Map<String, Object>> list = new ArrayList<>(livingAuthDTOS.size());
-		for (JSONObject s : livingAuthDTOS) {
-			Map<String, Object> data = new HashMap<>(1);
-			data.put("value", s.get("id"));
-			data.put("label", s.get("nickName"));
-			list.add(data);
-		}
-		System.out.println(list);
-	}
-
-
-	@Test
-	public void testCallBack()  {
-		String no ="GU152022022166674388";
-		callBack(no);
-	}
-
-	private void callBack(String no) {
-		CardGroupOrderInfo orderInfo = cardGroupOrderInfoMapper.getByOrderNo(no);
-		ResourceData resourceData=new ResourceData();
-		resourceData.setOut_trade_no(no);
-		resourceData.setTrade_type(orderInfo.getPaymentType());//支付类型
-		resourceData.setTransaction_id(String.valueOf(new Date().getTime()));//支付流水号，微信支付订单号
-		resourceData.setSuccess_time(DateUtils.dateTime(new Date()));//支付成功时间
-		resourceData.setTrade_state("TRADE_SUCCESS");//支付状态
-		resourceData.setTrade_state_desc("TRADE_SUCCESS");//支付状态说明
-		resourceData.setBank_type("支付宝");//付款银行
-		ResourceData.PayAmount payAmount = new ResourceData.PayAmount();
-		payAmount.setTotal(orderInfo.getActualPayment().multiply(new BigDecimal(100)).intValue());
-		payAmount.setPayer_total(payAmount.getTotal());
-		resourceData.setAmount(payAmount);
-		groupApiService.paymentResult(resourceData);
-	}
-
-
-}

poyi-app/src/test/java/com/poyee/act/AppActControllerTest.java

@@ -1,99 +0,0 @@
-package com.poyee.act;
-
-import com.alibaba.fastjson.JSON;
-import com.poyee.BaseTest;
-import com.tzy.PoyiApplication;
-import com.tzy.common.dto.InDto;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author by po'yi
- * @Classname AppActControllerTest
- * @Description TODO
- * @Date 2022/11/14 18:47
- */
-@Slf4j
-@SpringBootTest(classes = PoyiApplication.class)
-@RunWith(SpringRunner.class)
-@AutoConfigureMockMvc
-class AppActControllerTest extends BaseTest {
-	@Autowired
-	private MockMvc mockMvc;
-
-	@Test
-	void getPrize() {
-
-	}
-
-	@Test
-	void getSimpleActInfo() {
-	}
-
-	@Test
-	void getActInfo() {
-	}
-
-	@Test
-	void getUserActRecord() {
-	}
-
-	@Test
-	void getActRecord() {
-	}
-
-	@Test
-	void luckDraw() {
-	}
-
-	@Test
-	void getGuessActInfo() throws Exception {
-		Map<String, Object> data = new HashMap(){{
-			put("actId",28);
-		}};
-		InDto param = buildUserIndto(data);
-		MvcResult mvcResult = mockMvc.perform(MockMvcRequestBuilders.post("/api/v1.7/act/guess/info")
-				.accept(MediaType.APPLICATION_JSON_UTF8).contentType(MediaType.APPLICATION_JSON_UTF8)
-				.content(JSON.toJSONString(param)))
-				.andExpect(MockMvcResultMatchers.status().isOk()).andReturn();
-		int status = mvcResult.getResponse().getStatus();
-		System.out.println(status);
-		//String result = mvcResult.getResponse().getContentAsString();
-		//System.out.println(result);
-
-	}
-
-	@Test
-	void getGuessActTeams() {
-	}
-
-	@Test
-	void getUserGuessRecord() {
-	}
-
-	@Test
-	void userGuessTeam() {
-	}
-
-	@Test
-	void getTeamGuessNums() {
-	}
-
-	@Test
-	void getActRankList() {
-
-	}
-}

poyi-app/src/test/java/com/poyee/goods/GoodsLocalTest.java

@@ -1,47 +0,0 @@
-package com.poyee.goods;
-
-import com.poyee.BaseTest;
-import com.tzy.PoyiApplication;
-import com.tzy.common.constant.Constants;
-import com.tzy.common.utils.http.forest.CommonForestClient;
-import com.tzy.dto.local.CardGroupGoodsDTO;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.teasoft.bee.osql.SuidRich;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author by po'yi
- * @Classname AppActControllerTest
- * @Description TODO
- * @Date 2022/11/14 18:47
- */
-@Slf4j
-@SpringBootTest(classes = PoyiApplication.class)
-@RunWith(SpringRunner.class)
-class GoodsLocalTest extends BaseTest {
-	@Autowired
-	private SuidRich suidRich;
-	@Resource
-	private CommonForestClient commonForestClient;
-
-	@Test
-	void addGoods() throws Exception {
-		CardGroupGoodsDTO condition=new CardGroupGoodsDTO();
-		condition.setGroupInfoId(944L);
-		//condition.setGroupInfoId(1120L);
-		//condition.setGroupInfoId(1115L);
-		//condition.setGroupInfoId(1089L);
-		List<CardGroupGoodsDTO> goods = suidRich.select(condition);
-		String url = "http://localhost:8089/api/goods/add";
-		String result = commonForestClient.sendPost(url, Constants.JSON_HEADS, goods);
-		System.out.println(result);
-	}
-
-}

tzy-framework/pom.xml

@@ -68,11 +68,6 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/lib/sf-csim-express-sdk-V2.1.5.jar</systemPath>
         </dependency>
-        <!-- flyway -->
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.impossibl.pgjdbc-ng</groupId>
             <artifactId>pgjdbc-ng</artifactId>

tzy-sportcard/src/main/java/com/tzy/sportcard/api/controller/BaseApiController.java

@@ -94,8 +94,6 @@ public class BaseApiController {
     private IAppCarouselPictureService appCarouselPictureService;
     @Value("${wx.default_avatar}")
     private String default_avatar ;
-    @Value("${pay.alipay.app.alipayPublicKey}")
-    private String privateAuth;
     @Autowired
     @Qualifier("threadPoolTaskExecutor")
     private ThreadPoolTaskExecutor pools;

tzy-sportcard/src/main/java/com/tzy/sportcard/api/controller/GroupApiController.java

@@ -98,8 +98,6 @@ public class GroupApiController {
 	private ICardCheckListService checkListService;
 	@Autowired
 	private ISysDictDataService dictDataService;
-	@Value("${pay.wxpay.app.appID}")
-	private String appId;
 	@Resource
 	private CommonCacheService commonCacheService;
 	@Autowired
@@ -108,8 +106,6 @@ public class GroupApiController {
 	private TzyMerchantAssessService tzyMerchantAssessService;
 	@Resource
 	private ITzyCardBaseInfoService cardBaseInfoService;
-	@Autowired
-	private PayService payService;
 	@Resource
 	private GroupActService groupActService;
 	@Resource
@@ -336,467 +332,7 @@ public class GroupApiController {
 		OutDTO outDTO = groupApiService.findGroupBySearch(inDto, cardGroupInfo);
 		return outDTO;
 	}
-	/**
-	 * 组团
-	 *
-	 * @param inDto
-	 * @return
-	 */
-	@ApiLog(title = "组团详情", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-	@ApiLimitRule(seconds = 1,limitCount = 30)
-	@ResponseBody
-	@RequestMapping(value = "/info", method = RequestMethod.POST)
-	public OutDTO info(@RequestBody InDto inDto) {
-		Integer id = inDto.getIntegerParam("id");
-		if (null == id) {
-			return OutDTO.error500("参数[id]不能为空");
-		}
-		GroupInfo groupInfo = groupApiService.getGroupInfoById(id);
-
-		if (groupInfo == null) {
-			return OutDTO.error500("拼团不存在!");
-		}
-		UserInfo user = UserUtils.getSimpleUserInfo();
-		Long userOrderId = null;
-		boolean isAdmin = false;
-		boolean isShipping = false;
-		if (user != null) {
-			isAdmin = UserType.USER_ROLE_ADMIN.equals(user.getRoleCode());
-			isShipping = UserType.USER_ROLE_SHIPPING.equals(user.getRoleCode());
-			userOrderId = groupApiService.getUserLastOrderId(user.getId(), id);
-			//appUserBrowseRecordService.addUserBrowseRecord(user.getId().longValue(), id.longValue(), "group", groupInfo.getMerchantId());
-			List<SysDictData> sysDictDatas = commonCacheService.getCommonDictData("app_user_browse_record_cache",
-					"isEnabled", "1", null, -1);
-			if(!sysDictDatas.isEmpty()) {
-				//int isEnabled = Integer.parseInt(sysDictDatas.get(0).getDictValue());
-				// 浏览记录入库，不影响接口正常返回
-				try {
-					appUserBrowseRecordService.addUserBrowseRecord(user.getId().longValue(), id.longValue(), "group", groupInfo.getMerchantId());
-				} catch (Exception e) {
-					log.error("添加浏览记录异常", e);
-				}
-
-			}
-		}
-		if (groupInfo.getStatus() == 201 && user != null) {
-			groupInfo.setFirstActAmount(groupApiService.getFirstActPrice(groupInfo.getId(), groupInfo.getFirstActConfig(), groupInfo.getType(),
-					 user.getId()));
-		}
-		//查询附件
-		List<FileDto> tzyEnclosures = groupApiService.searchByFromCode(groupInfo.getCode());
-		//查询已参与组团的用户
-		int orderNum = inDto.get("orderNum") == null ? 5 : (Integer) inDto.get("orderNum");
-		List<GroupUserOrderDto> orders = groupApiService.searchOrderByGroupId(id, orderNum);
-		orders.forEach(o -> {
-			if (o.getAnonymous() != null && o.getAnonymous()) {
-				o.setNickname(Constants.ANONYMOUS_NAME);
-				o.setAvatar(Constants.ANONYMOUS_AVATAR);
-			} else {
-				o.setNickname(StringUtils.isEmpty(o.getNickname()) ? "***" : o.getNickname().substring(0, 1) + "***");
-			}
-		});
-		//查询未付款的用户数（订单）
-		CardGroupOrderInfo cardGroupOrderInfo = new CardGroupOrderInfo();
-		cardGroupOrderInfo.setStatus(100L);
-		cardGroupOrderInfo.setGroupInfoId(groupInfo.getId());
-		int noPayment = orderInfoService.selectUnPaymentCount(cardGroupOrderInfo);
-		List<CardGroupGoodsIdx> cardGroupGoodsIdxes = new ArrayList<>();
-		List<BuyTeamDTO> goodsData = new ArrayList<>();
-		//如果组团方式是 随机球队
-		Object minMaxPrice = "";
-		Map<String, List<GroupTeamDTO>> selectTeams=null;
-		if (Constants.INFO_TYPE_TEAM.equals(groupInfo.getType())) {
-			//查询选中列表
-			CardGroupGoodsIdx cardGroupGoodsIdx = new CardGroupGoodsIdx();
-			cardGroupGoodsIdx.setGroupInfoId(groupInfo.getId());
-			cardGroupGoodsIdxes = cardGroupGoodsIdxService.selectCardGroupGoodsIdxList(cardGroupGoodsIdx);
-		} else if (Constants.INFO_TYPE_BUY_TEAM.equals(groupInfo.getType())) {
-			CardGroupGoods condition = new CardGroupGoods();
-			condition.setGroupInfoId(groupInfo.getId());
-			List<CardGroupGoods> cardGroupGoods = cardGroupGoodsService.selectCardGroupGoodsList(condition);
-			minMaxPrice=groupApiService.getMinMaxPrice(groupInfo.getId());
-			//新版订单购买未付款被占卡密
-			List<String> selectedIds = groupApiService.getUnSoldSelectedGoodsId(groupInfo.getId());
-			if (!selectedIds.isEmpty()) {
-				cardGroupGoods.stream().filter(g -> g.getSelected() == 0 && selectedIds.contains(g.getId().toString()))
-						.forEach(g -> g.setSelected(1));
-			}
-			Map<String, List<CardGroupGoodsDTO>> goodsDataMap = cardGroupGoods.stream().sorted(Comparator.comparing(CardGroupGoods::getSelected))
-					.map(CardGroupGoodsDTO::buildByGoods)
-					.collect(groupingBy(CardGroupGoodsDTO::getTeam));
-			Set<String> typeSets = goodsDataMap.keySet();
-			typeSets.forEach(type -> goodsData.add(new BuyTeamDTO(type, goodsDataMap.get(type))));
-		} else if (Constants.INFO_TYPE_SELECT_TEAM.equals(groupInfo.getType())) {
-			minMaxPrice = groupApiService.getMinMaxPrice(groupInfo.getId());
-			if (Constants.INFO_TYPE_TEAM_TO_RANDOM.equals(groupInfo.getChangeType())) {
-				selectTeams = groupApiService.getGroupTeamToRandom(id);
-			}
-		}
-		Integer userOrderNums=0;
-		if(inDto.getUserId()!=null){
-			groupInfo.setFollowStatus(merchantApiService.getUserFollowStatus(inDto.getUserId(),groupInfo.getMerchantId().intValue()));
-			userOrderNums=orderInfoService.selectUserOrderNums(inDto.getUserId(),groupInfo.getId());
-		}
-
-		//营销信息
-		JSONArray marketing =  GroupApiServiceImpl.buildInfoMarketJson(groupInfo.getMarketingInfo());
-
-		String actConfigJson = groupInfo.getActConfigJson();
-		if(StringUtils.isNotEmpty(actConfigJson)){
-			InfoActConfig infoActConfig = JSONTools.jsonStr2obj(actConfigJson, InfoActConfig.class);
-			if(InfoActConfig.ACT_TYPE_GUESS_TEAM.equals(infoActConfig.getType())){
-				groupInfo.setGuessAct(true);
-			}
-		}
-
-		//审核相关信息
-		if(groupInfo.getStatus()>=100 && groupInfo.getStatus()<=103){
-			groupInfo.setPriceInterval(groupApiService.getPriceInterval(groupInfo.getPaniniListId()));
-			groupInfo.setTypeCounts(groupApiService.getCountByInfo(groupInfo));
-		}
-
-		MerInfoCountDTO merInfoCountDTO = merchantApiService.getMerInfoCount(groupInfo.getMerchantId());
-		tzyEnclosures.add(0, new FileDto("coverPicture", groupInfo.getCoverPicture()));
-		groupInfo.setJumpAppletFlag(appId.equals(groupInfo.getLiveAppid()));
-
-		if(!isAdmin){
-			tzyEnclosures=tzyEnclosures.stream().filter(file -> !("video".equals(file.getCategory()))).collect(Collectors.toList());
-			String configJson = groupInfo.getConfigJson();
-			if(StringUtils.isNotEmpty(configJson)){
-				JSONObject jsonObject = JSON.parseObject(configJson);
-				jsonObject.put("weightUrl","");
-				jsonObject.put("video","");
-				groupInfo.setConfigJson(jsonObject.toJSONString());
-			}
-		}
-
-		//判断当前登陆的用户是否是商家角色
-		boolean confirmStatus = isShipping && groupInfo.getMerchantId() == user.getMerchantId().longValue();
-		boolean livingOpenAble = true;
-
-		List<CodeRecordDTO> codeRecords = groupApiService.getRefCodeRecord(groupInfo.getId(), null);
-		boolean hasSaleCode = !CollectionUtils.isEmpty(codeRecords);
-		if (isShipping || isAdmin) {
-			if (!CollectionUtils.isEmpty(codeRecords)) {
-				// 判断生态购
-				livingOpenAble = codeRecords.stream().noneMatch(c -> c.getStatus() == 0);
-			}
-		} else {
-			codeRecords = CollectionUtils.isEmpty(codeRecords) ? new ArrayList<>() : Collections.singletonList(new CodeRecordDTO());
-		}
-
-		//新版生态购
-		GroupSaleCodeDTO saleCodeConfig = groupActService.getGroupSaleCodeConfig(groupInfo.getId(),groupInfo.getStatus()>=201);
-		List<CountDTO> codeCountByType=new ArrayList<>();
-		ChecklistBaseConfigDto baseConfig = sysBaseService.selectChecklistBaseConfigAndPriceV2(id);
-		if (saleCodeConfig.isHasBoxConfig()) {
-			hasSaleCode = true;
-			livingOpenAble = groupActService.checkGroupSaleCodeCount(groupInfo.getId(), groupInfo.getMerchantId().intValue(), saleCodeConfig);
-			if(groupInfo.getStatus()==203){
-				codeCountByType=groupActService.selectUseAbleCountByType(groupInfo.getMerchantId().intValue(),
-						baseConfig.getSetsVersion(), groupInfo.getPaniniListId());
-			}
-		}
-
-		if(!tzyEnclosures.isEmpty()&&StringUtils.isEmpty(groupInfo.getCarouses())){
-			String urls = tzyEnclosures.stream().filter(file -> ("CarouseMap".equals(file.getCategory())))
-					.map(FileDto::getUrl).collect(Collectors.joining(","));
-			groupInfo.setCarouses(urls);
-		}
-		long unlockNUm=0;
-		if(groupInfo.isPreSale()){
-			unlockNUm=groupInfo.getSoldCopies()-noPayment-groupInfo.getRealSoldNum();
-			groupInfo.setSoldCopies(groupInfo.getRealSoldNum());
-		}else {
-			groupInfo.setSoldCopies(noPayment+groupInfo.getRealSoldNum());
-		}
-		// 查询商家店铺会员信息
-		MerchantScoreDTO merchantScoreDTO = tzyMerchantAssessService.getMerchantMemberInfoV3(groupInfo.getMerchantId());
-		//拼团积分
-		BigDecimal groupPoint = BigDecimal.ZERO;
-		if (user != null && StringUtils.isNotEmpty(groupInfo.getPointType())) {
-			Long point = mineApiService.getUserPointByType(user.getId(), groupInfo.getPointType(), groupInfo.getMerchantId().intValue());
-			groupPoint = new BigDecimal(point.toString()).divide(Constants.HUNDRED, 2, RoundingMode.HALF_DOWN);
-		}
-		String refSkuIds="";
-		Long refSpuId=null;
-		if (StringUtils.isNotEmpty(groupInfo.getPointType())) {
-			List<SimpleSku> skuList = groupApiService.getRefSkus(groupInfo.getId());
-			if (!CollectionUtils.isEmpty(skuList)) {
-				refSkuIds = skuList.stream().map(s -> s.getId().toString()).collect(Collectors.joining(","));
-				SimpleSku sku = skuList.get(0);
-				refSpuId = sku.getSpuId();
-				if (StringUtils.isEmpty(groupInfo.getGroupShowName())) {
-					groupInfo.setGroupShowName(sku.getSkuName());
-					groupInfo.setGroupShowImgs(sku.getCarouselImgUrl());
-				}
-			}
-		}
-
-		List<GroupRelatedInfoDto> relatedGroupInfo = groupApiService.getRelatedGroupInfoById(groupInfo.getListId(),groupInfo.getId(),groupInfo.getMerchantId(),baseConfig.getParentId(),baseConfig.getPaniniConfigId(),groupInfo.getCode(),groupInfo.getType());
-		//groupApiService.getGroupInfoRank(groupInfo);
-		return OutDTO.ok().put("groupInfo", groupInfo)
-				.put("relatedGroupInfo", relatedGroupInfo)
-				.put("file", tzyEnclosures)
-				.put("merInfoCount", merInfoCountDTO)
-				.put("favorablePrice", groupApiService.getLowActPrice(groupInfo.getUnitPrice(), groupInfo.getMarketingInfo()))
-				.put("marketing", marketing)
-				.put("orders", orders)
-				.put("userOrderId", userOrderId)
-				.put("minMaxPrice", minMaxPrice)
-				.put("noPayment", noPayment)
-				.put("unlockNUm", unlockNUm)
-				.put("lastTeams", selectTeams)
-				.put("cardGroupGoodsIdxes", cardGroupGoodsIdxes)
-				.put("goodsData", goodsData)
-				.put("userOrderNums", userOrderNums)
-				.put("merchantBond", merchantApiService.getMerchantBond(groupInfo.getMerchantId()))
-				.put("confirmStatus", confirmStatus)
-				.put("merchantScore", merchantScoreDTO)
-				.put("baseConfig", isAdmin ? baseConfig : new ChecklistBaseConfigDto())
-				.put("custom", sysBaseService.selectChecklistBaseCustom(id))
-				.put("groupPoint", groupPoint)
-				.put("refSkuIds", refSkuIds)
-				.put("refSpuId", refSpuId)
-				.put("codeRecords", codeRecords)
-				.put("firstActConfig", isAdmin ? groupInfo.getFirstActConfig() : null)
-				.put("livingOpenAble", livingOpenAble)
-				.put("saleCodeConfig", saleCodeConfig)
-				.put("hasSaleCode", hasSaleCode)
-				.put("codeCountByType", codeCountByType)
-				.put("followFlag", mineApiService.isFollowed(Constants.GROUP_DETAIL_FOLLOW, id, inDto.getUserId()))
-				;
-
-	}
-
-	/**
-	 * 组团
-	 *
-	 * @param inDto
-	 * @return
-	 */
-	@ApiLog(title = "组团详情", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-	@ApiLimitRule(seconds = 1,limitCount = 30)
-	@ResponseBody
-	@RequestMapping(value = "/info/test", method = RequestMethod.POST)
-	public OutDTO infoTest(@RequestBody InDto inDto) {
-		Integer id = inDto.getIntegerParam("id");
-		if (null == id) {
-			return OutDTO.error500("参数[id]不能为空");
-		}
-		GroupInfo groupInfo = groupApiService.getGroupInfoById(id);
-
-		if (groupInfo == null) {
-			return OutDTO.error500("拼团不存在!");
-		}
-		UserInfo user = UserUtils.getSimpleUserInfo();
-		Long userOrderId = null;
-		boolean isAdmin = false;
-		boolean isShipping = false;
-		if (user != null) {
-			isAdmin = UserType.USER_ROLE_ADMIN.equals(user.getRoleCode());
-			isShipping = UserType.USER_ROLE_SHIPPING.equals(user.getRoleCode());
-			userOrderId = groupApiService.getUserLastOrderId(user.getId(), id);
-			pools.execute(() -> {
-				// 浏览记录入库，不影响接口正常返回
-				try {
-					appUserBrowseRecordService.addUserBrowseRecord(user.getId().longValue(), id.longValue(), "group", groupInfo.getMerchantId());
-				} catch (Exception e) {
-					log.error("添加浏览记录异常", e);
-				}
-			});
-		}
-		if (groupInfo.getStatus() == 201 && user != null) {
-			groupInfo.setFirstActAmount(groupApiService.getFirstActPrice(groupInfo.getId(), groupInfo.getFirstActConfig(), groupInfo.getType(),
-					user.getId()));
-		}
-		//查询附件
-		List<FileDto> tzyEnclosures = groupApiService.searchByFromCode(groupInfo.getCode());
-		//查询已参与组团的用户
-		int orderNum = inDto.get("orderNum") == null ? 5 : (Integer) inDto.get("orderNum");
-		List<GroupUserOrderDto> orders = groupApiService.searchOrderByGroupId(id, orderNum);
-		orders.forEach(o -> {
-			if (o.getAnonymous() != null && o.getAnonymous()) {
-				o.setNickname(Constants.ANONYMOUS_NAME);
-				o.setAvatar(Constants.ANONYMOUS_AVATAR);
-			} else {
-				o.setNickname(StringUtils.isEmpty(o.getNickname()) ? "***" : o.getNickname().substring(0, 1) + "***");
-			}
-		});
-		//查询未付款的用户数（订单）
-		CardGroupOrderInfo cardGroupOrderInfo = new CardGroupOrderInfo();
-		cardGroupOrderInfo.setStatus(100L);
-		cardGroupOrderInfo.setGroupInfoId(groupInfo.getId());
-		int noPayment = orderInfoService.selectUnPaymentCount(cardGroupOrderInfo);
-		List<CardGroupGoodsIdx> cardGroupGoodsIdxes = new ArrayList<>();
-		List<BuyTeamDTO> goodsData = new ArrayList<>();
-		//如果组团方式是 随机球队
-		Object minMaxPrice = "";
-		Map<String, List<GroupTeamDTO>> selectTeams=null;
-		if (Constants.INFO_TYPE_TEAM.equals(groupInfo.getType())) {
-			//查询选中列表
-			CardGroupGoodsIdx cardGroupGoodsIdx = new CardGroupGoodsIdx();
-			cardGroupGoodsIdx.setGroupInfoId(groupInfo.getId());
-			cardGroupGoodsIdxes = cardGroupGoodsIdxService.selectCardGroupGoodsIdxList(cardGroupGoodsIdx);
-		} else if (Constants.INFO_TYPE_BUY_TEAM.equals(groupInfo.getType())) {
-			CardGroupGoods condition = new CardGroupGoods();
-			condition.setGroupInfoId(groupInfo.getId());
-			List<CardGroupGoods> cardGroupGoods = cardGroupGoodsService.selectCardGroupGoodsList(condition);
-			minMaxPrice=groupApiService.getMinMaxPrice(groupInfo.getId());
-			//新版订单购买未付款被占卡密
-			List<String> selectedIds = groupApiService.getUnSoldSelectedGoodsId(groupInfo.getId());
-			if (!selectedIds.isEmpty()) {
-				cardGroupGoods.stream().filter(g -> g.getSelected() == 0 && selectedIds.contains(g.getId().toString()))
-						.forEach(g -> g.setSelected(1));
-			}
-			Map<String, List<CardGroupGoodsDTO>> goodsDataMap = cardGroupGoods.stream().sorted(Comparator.comparing(CardGroupGoods::getSelected))
-					.map(CardGroupGoodsDTO::buildByGoods)
-					.collect(groupingBy(CardGroupGoodsDTO::getTeam));
-			Set<String> typeSets = goodsDataMap.keySet();
-			typeSets.forEach(type -> goodsData.add(new BuyTeamDTO(type, goodsDataMap.get(type))));
-		} else if (Constants.INFO_TYPE_SELECT_TEAM.equals(groupInfo.getType())) {
-			minMaxPrice = groupApiService.getMinMaxPrice(groupInfo.getId());
-			if (Constants.INFO_TYPE_TEAM_TO_RANDOM.equals(groupInfo.getChangeType())) {
-				selectTeams = groupApiService.getGroupTeamToRandom(id);
-			}
-		}
-		Integer userOrderNums=0;
-		if(inDto.getUserId()!=null){
-			groupInfo.setFollowStatus(merchantApiService.getUserFollowStatus(inDto.getUserId(),groupInfo.getMerchantId().intValue()));
-			userOrderNums=orderInfoService.selectUserOrderNums(inDto.getUserId(),groupInfo.getId());
-		}
-
-		//营销信息
-		JSONArray marketing =  GroupApiServiceImpl.buildInfoMarketJson(groupInfo.getMarketingInfo());
 
-		String actConfigJson = groupInfo.getActConfigJson();
-		if(StringUtils.isNotEmpty(actConfigJson)){
-			InfoActConfig infoActConfig = JSONTools.jsonStr2obj(actConfigJson, InfoActConfig.class);
-			if(InfoActConfig.ACT_TYPE_GUESS_TEAM.equals(infoActConfig.getType())){
-				groupInfo.setGuessAct(true);
-			}
-		}
-
-		//审核相关信息
-		if(groupInfo.getStatus()>=100 && groupInfo.getStatus()<=103){
-			groupInfo.setPriceInterval(groupApiService.getPriceInterval(groupInfo.getPaniniListId()));
-			groupInfo.setTypeCounts(groupApiService.getCountByInfo(groupInfo));
-		}
-
-		MerInfoCountDTO merInfoCountDTO = merchantApiService.getMerInfoCount(groupInfo.getMerchantId());
-		tzyEnclosures.add(0, new FileDto("coverPicture", groupInfo.getCoverPicture()));
-		groupInfo.setJumpAppletFlag(appId.equals(groupInfo.getLiveAppid()));
-
-		if(!isAdmin){
-			tzyEnclosures=tzyEnclosures.stream().filter(file -> !("video".equals(file.getCategory()))).collect(Collectors.toList());
-			String configJson = groupInfo.getConfigJson();
-			if(StringUtils.isNotEmpty(configJson)){
-				JSONObject jsonObject = JSON.parseObject(configJson);
-				jsonObject.put("weightUrl","");
-				jsonObject.put("video","");
-				groupInfo.setConfigJson(jsonObject.toJSONString());
-			}
-		}
-
-		//判断当前登陆的用户是否是商家角色
-		boolean confirmStatus = isShipping && groupInfo.getMerchantId() == user.getMerchantId().longValue();
-		boolean livingOpenAble = true;
-
-		List<CodeRecordDTO> codeRecords = groupApiService.getRefCodeRecord(groupInfo.getId(), null);
-		boolean hasSaleCode = !CollectionUtils.isEmpty(codeRecords);
-		if (isShipping || isAdmin) {
-			if (!CollectionUtils.isEmpty(codeRecords)) {
-				// 判断生态购
-				livingOpenAble = codeRecords.stream().noneMatch(c -> c.getStatus() == 0);
-			}
-		} else {
-			codeRecords = CollectionUtils.isEmpty(codeRecords) ? new ArrayList<>() : Collections.singletonList(new CodeRecordDTO());
-		}
-
-		//新版生态购
-		GroupSaleCodeDTO saleCodeConfig = groupActService.getGroupSaleCodeConfig(groupInfo.getId(),groupInfo.getStatus()>=201);
-		List<CountDTO> codeCountByType=new ArrayList<>();
-		ChecklistBaseConfigDto baseConfig = sysBaseService.selectChecklistBaseConfigAndPriceV2(id);
-		if (saleCodeConfig.isHasBoxConfig()) {
-			hasSaleCode = true;
-			livingOpenAble = groupActService.checkGroupSaleCodeCount(groupInfo.getId(), groupInfo.getMerchantId().intValue(), saleCodeConfig);
-			if(groupInfo.getStatus()==203){
-				codeCountByType=groupActService.selectUseAbleCountByType(groupInfo.getMerchantId().intValue(),
-						baseConfig.getSetsVersion(), groupInfo.getPaniniListId());
-			}
-		}
-
-		if(!tzyEnclosures.isEmpty()&&StringUtils.isEmpty(groupInfo.getCarouses())){
-			String urls = tzyEnclosures.stream().filter(file -> ("CarouseMap".equals(file.getCategory())))
-					.map(FileDto::getUrl).collect(Collectors.joining(","));
-			groupInfo.setCarouses(urls);
-		}
-		long unlockNUm=0;
-		if(groupInfo.isPreSale()){
-			unlockNUm=groupInfo.getSoldCopies()-noPayment-groupInfo.getRealSoldNum();
-			groupInfo.setSoldCopies(groupInfo.getRealSoldNum());
-		}else {
-			groupInfo.setSoldCopies(noPayment+groupInfo.getRealSoldNum());
-		}
-		// 查询商家店铺会员信息
-		MerchantScoreDTO merchantScoreDTO = tzyMerchantAssessService.getMerchantMemberInfoV3(groupInfo.getMerchantId());
-		//拼团积分
-		BigDecimal groupPoint = BigDecimal.ZERO;
-		if (user != null && StringUtils.isNotEmpty(groupInfo.getPointType())) {
-			Long point = mineApiService.getUserPointByType(user.getId(), groupInfo.getPointType(), groupInfo.getMerchantId().intValue());
-			groupPoint = new BigDecimal(point.toString()).divide(Constants.HUNDRED, 2, RoundingMode.HALF_DOWN);
-		}
-		String refSkuIds="";
-		Long refSpuId=null;
-		if (StringUtils.isNotEmpty(groupInfo.getPointType())) {
-			List<SimpleSku> skuList = groupApiService.getRefSkus(groupInfo.getId());
-			if (!CollectionUtils.isEmpty(skuList)) {
-				refSkuIds = skuList.stream().map(s -> s.getId().toString()).collect(Collectors.joining(","));
-				SimpleSku sku = skuList.get(0);
-				refSpuId = sku.getSpuId();
-				if (StringUtils.isEmpty(groupInfo.getGroupShowName())) {
-					groupInfo.setGroupShowName(sku.getSkuName());
-					groupInfo.setGroupShowImgs(sku.getCarouselImgUrl());
-				}
-			}
-		}
-
-		List<GroupRelatedInfoDto> relatedGroupInfo = groupApiService.getRelatedGroupInfoById(groupInfo.getListId(),groupInfo.getId(),groupInfo.getMerchantId(),baseConfig.getParentId(),baseConfig.getPaniniConfigId(),groupInfo.getCode(),groupInfo.getType());
-		//groupApiService.getGroupInfoRank(groupInfo);
-		return OutDTO.ok().put("groupInfo", groupInfo)
-				.put("relatedGroupInfo", relatedGroupInfo)
-				.put("file", tzyEnclosures)
-				.put("merInfoCount", merInfoCountDTO)
-				.put("favorablePrice", groupApiService.getLowActPrice(groupInfo.getUnitPrice(), groupInfo.getMarketingInfo()))
-				.put("marketing", marketing)
-				.put("orders", orders)
-				.put("userOrderId", userOrderId)
-				.put("minMaxPrice", minMaxPrice)
-				.put("noPayment", noPayment)
-				.put("unlockNUm", unlockNUm)
-				.put("lastTeams", selectTeams)
-				.put("cardGroupGoodsIdxes", cardGroupGoodsIdxes)
-				.put("goodsData", goodsData)
-				.put("userOrderNums", userOrderNums)
-				.put("merchantBond", merchantApiService.getMerchantBond(groupInfo.getMerchantId()))
-				.put("confirmStatus", confirmStatus)
-				.put("merchantScore", merchantScoreDTO)
-				.put("baseConfig", isAdmin ? baseConfig : new ChecklistBaseConfigDto())
-				.put("custom", sysBaseService.selectChecklistBaseCustom(id))
-				.put("groupPoint", groupPoint)
-				.put("refSkuIds", refSkuIds)
-				.put("refSpuId", refSpuId)
-				.put("codeRecords", codeRecords)
-				.put("firstActConfig", isAdmin ? groupInfo.getFirstActConfig() : null)
-				.put("livingOpenAble", livingOpenAble)
-				.put("saleCodeConfig", saleCodeConfig)
-				.put("hasSaleCode", hasSaleCode)
-				.put("codeCountByType", codeCountByType)
-				.put("followFlag", mineApiService.isFollowed(Constants.GROUP_DETAIL_FOLLOW, id, inDto.getUserId()))
-				.put("existRefundMsg", redisUtils.get(GROUP_REFUND_REQ + id))
-				;
-
-	}
 
 
 	/**
@@ -1532,274 +1068,6 @@ public class GroupApiController {
 		return OutDTO.ok().put("cardList", cardList);
 	}
 
-	/**
-	 * 获取银行卡列表
-	 *
-	 * @param inDto
-	 * @return
-	 */
-	@ApiLog(title = "获取银行卡列表-v2", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-	@ResponseBody
-	@RequestMapping(value = "/v2/getBankList", method = RequestMethod.POST)
-	public OutDTO getBankListV2(@RequestBody InDto inDto) {
-		AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-		//查询订单信息
-		Object orderIdObj = inDto.get("orderId");
-		if(null == orderIdObj ) return OutDTO.error(10040,"参数[orderId]不能为空");
-		Integer orderId = (Integer) orderIdObj;
-		CardGroupOrderInfo orderInfo = orderInfoService.selectCardGroupOrderInfoById(Long.valueOf(orderId));
-		if(null == orderInfo)return OutDTO.error(10050,"未找到订单信息");
-
-		if(System.currentTimeMillis()>orderInfo.getExpireTime().getTime()){
-			return OutDTO.error(10050,"订单已超时");
-		}
-		Long groupInfoId = orderInfo.getGroupInfoId();
-		//1.查询团卡工单信息
-		CardGroupInfo cardGroupInfo = cardGroupInfoService.selectCardGroupInfoById(groupInfoId);
-		//判断组团
-		if(null == cardGroupInfo && "group".equals(orderInfo.getOrderType())){
-			return OutDTO.error(10040,"未找到组团信息");
-		}
-		//判断是否超过限购
-		if(null != cardGroupInfo && !groupApiService.checkQuota(cardGroupInfo,inDto.getUserId(), 0)){
-			return OutDTO.error(20031, "超过限购");
-		}
-		//如果是选择手机银行支付
-		return payService.getBankList(inDto, appUserInfoDto, orderInfo, cardGroupInfo);
-	}
-
-
-
-	/**
-	 * 组团
-	 *
-	 * @param inDto
-	 * @return
-	 */
-	@ApiLog(title = "组团详情简化", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-	@ApiLimitRule(seconds = 1,limitCount = 400)
-	@ResponseBody
-	@ApiVersion(4.3)
-	@RequestMapping(value = "/{version}/info", method = RequestMethod.POST)
-	public OutDTO infoSimple(@RequestBody InDto inDto) {
-		Integer id = inDto.getIntegerParam("id");
-		if (null == id) {
-			return OutDTO.error500("参数[id]不能为空");
-		}
-		GroupInfo groupInfo = groupApiService.getGroupInfoById(id);
-
-		if (groupInfo == null) {
-			return OutDTO.error500("拼团不存在!");
-		}
-		UserInfo user = UserUtils.getSimpleUserInfo();
-		Long userOrderId = null;
-		boolean isAdmin = false;
-		boolean isShipping = false;
-		if (user != null) {
-			isAdmin = UserType.USER_ROLE_ADMIN.equals(user.getRoleCode());
-			isShipping = UserType.USER_ROLE_SHIPPING.equals(user.getRoleCode());
-			userOrderId = groupApiService.getUserLastOrderId(user.getId(), id);
-			log.warn("userOrderId {} with user{}", userOrderId,user.getId());
-			List<SysDictData> sysDictDatas = commonCacheService.getCommonDictData("app_user_browse_record_cache",
-					"isEnabled", "1", null, -1);
-			if(!sysDictDatas.isEmpty()) {
-				// 浏览记录入库，不影响接口正常返回
-				try {
-					appUserBrowseRecordService.addUserBrowseRecord(user.getId().longValue(), id.longValue(), "group", groupInfo.getMerchantId());
-				} catch (Exception e) {
-					log.error("添加浏览记录异常", e);
-				}
-			}
-		}
-		if (groupInfo.getStatus() == 201 && user != null) {
-			groupInfo.setFirstActAmount(groupApiService.getFirstActPrice(groupInfo.getId(), groupInfo.getFirstActConfig(), groupInfo.getType(),
-					user.getId()));
-		}
-		//查询附件
-		List<FileDto> tzyEnclosures = groupApiService.searchByFromCode(groupInfo.getCode());
-		//查询已参与组团的用户
-		int orderNum = inDto.get("orderNum") == null ? 5 : (Integer) inDto.get("orderNum");
-		List<GroupUserOrderDto> orders = groupApiService.searchOrderByGroupId(id, orderNum);
-		orders.forEach(o -> {
-			if (o.getAnonymous() != null && o.getAnonymous()) {
-				o.setNickname(Constants.ANONYMOUS_NAME);
-				o.setAvatar(Constants.ANONYMOUS_AVATAR);
-			} else {
-				o.setNickname(StringUtils.isEmpty(o.getNickname()) ? "***" : o.getNickname().substring(0, 1) + "***");
-			}
-		});
-		//查询未付款的用户数（订单）
-		CardGroupOrderInfo cardGroupOrderInfo = new CardGroupOrderInfo();
-		cardGroupOrderInfo.setStatus(100L);
-		cardGroupOrderInfo.setGroupInfoId(groupInfo.getId());
-		int noPayment = orderInfoService.selectUnPaymentCount(cardGroupOrderInfo);
-		List<BuyTeamDTO> goodsData = new ArrayList<>();
-		//如果组团方式是 随机球队
-		Object minMaxPrice = "";
-		Map<String, List<GroupTeamDTO>> selectTeams=null;
-		if (Constants.INFO_TYPE_TEAM.equals(groupInfo.getType())) {
-			//查询选中列表
-			CardGroupGoodsIdx cardGroupGoodsIdx = new CardGroupGoodsIdx();
-			cardGroupGoodsIdx.setGroupInfoId(groupInfo.getId());
-		} else if (Constants.INFO_TYPE_BUY_TEAM.equals(groupInfo.getType())) {
-			CardGroupGoods condition = new CardGroupGoods();
-			condition.setGroupInfoId(groupInfo.getId());
-			List<CardGroupGoods> cardGroupGoods = cardGroupGoodsService.selectCardGroupGoodsList(condition);
-			minMaxPrice=groupApiService.getMinMaxPrice(groupInfo.getId());
-			//新版订单购买未付款被占卡密
-			List<String> selectedIds = groupApiService.getUnSoldSelectedGoodsId(groupInfo.getId());
-			if (!selectedIds.isEmpty()) {
-				cardGroupGoods.stream().filter(g -> g.getSelected() == 0 && selectedIds.contains(g.getId().toString()))
-						.forEach(g -> g.setSelected(1));
-			}
-			Map<String, List<CardGroupGoodsDTO>> goodsDataMap = cardGroupGoods.stream().sorted(Comparator.comparing(CardGroupGoods::getSelected))
-					.map(CardGroupGoodsDTO::buildByGoods)
-					.collect(groupingBy(CardGroupGoodsDTO::getTeam));
-			Set<String> typeSets = goodsDataMap.keySet();
-			typeSets.forEach(type -> goodsData.add(new BuyTeamDTO(type, goodsDataMap.get(type))));
-		} else if (Constants.INFO_TYPE_SELECT_TEAM.equals(groupInfo.getType())) {
-			minMaxPrice = groupApiService.getMinMaxPrice(groupInfo.getId());
-			if (Constants.INFO_TYPE_TEAM_TO_RANDOM.equals(groupInfo.getChangeType())) {
-			}
-		}
-		Integer userOrderNums=0;
-		if(inDto.getUserId()!=null){
-			groupInfo.setFollowStatus(merchantApiService.getUserFollowStatus(inDto.getUserId(),groupInfo.getMerchantId().intValue()));
-			userOrderNums=orderInfoService.selectUserOrderNums(inDto.getUserId(),groupInfo.getId());
-		}
-
-		//营销信息
-		JSONArray marketing =  GroupApiServiceImpl.buildInfoMarketJson(groupInfo.getMarketingInfo());
-
-		String actConfigJson = groupInfo.getActConfigJson();
-		if(StringUtils.isNotEmpty(actConfigJson)){
-			InfoActConfig infoActConfig = JSONTools.jsonStr2obj(actConfigJson, InfoActConfig.class);
-			if(InfoActConfig.ACT_TYPE_GUESS_TEAM.equals(infoActConfig.getType())){
-				groupInfo.setGuessAct(true);
-			}
-		}
-
-		//审核相关信息
-		if(groupInfo.getStatus()>=100 && groupInfo.getStatus()<=103){
-			groupInfo.setPriceInterval(groupApiService.getPriceInterval(groupInfo.getPaniniListId()));
-			groupInfo.setTypeCounts(groupApiService.getCountByInfo(groupInfo));
-		}
-
-		tzyEnclosures.add(0, new FileDto("coverPicture", groupInfo.getCoverPicture()));
-		groupInfo.setJumpAppletFlag(appId.equals(groupInfo.getLiveAppid()));
-
-		if(!isAdmin){
-			tzyEnclosures=tzyEnclosures.stream().filter(file -> !("video".equals(file.getCategory()))).collect(Collectors.toList());
-			String configJson = groupInfo.getConfigJson();
-			if(StringUtils.isNotEmpty(configJson)){
-				JSONObject jsonObject = JSON.parseObject(configJson);
-				jsonObject.put("weightUrl","");
-				jsonObject.put("video","");
-				groupInfo.setConfigJson(jsonObject.toJSONString());
-			}
-		}
-
-		//判断当前登陆的用户是否是商家角色
-		boolean confirmStatus = isShipping && groupInfo.getMerchantId() == user.getMerchantId().longValue();
-		boolean livingOpenAble = true;
-
-		List<CodeRecordDTO> codeRecords = groupApiService.getRefCodeRecord(groupInfo.getId(), null);
-		boolean hasSaleCode = !CollectionUtils.isEmpty(codeRecords);
-		if (isShipping || isAdmin) {
-			if (!CollectionUtils.isEmpty(codeRecords)) {
-				// 判断生态购
-				livingOpenAble = codeRecords.stream().noneMatch(c -> c.getStatus() == 0);
-			}
-		} else {
-			codeRecords = CollectionUtils.isEmpty(codeRecords) ? new ArrayList<>() : Collections.singletonList(new CodeRecordDTO());
-		}
-
-		//新版生态购
-		GroupSaleCodeDTO saleCodeConfig = groupActService.getGroupSaleCodeConfig(groupInfo.getId(),groupInfo.getStatus()>=201);
-		List<CountDTO> codeCountByType=new ArrayList<>();
-		ChecklistBaseConfigDto baseConfig = sysBaseService.selectChecklistBaseConfigAndPriceV2(id);
-		if (saleCodeConfig.isHasBoxConfig()) {
-			hasSaleCode = true;
-			livingOpenAble = groupActService.checkGroupSaleCodeCount(groupInfo.getId(), groupInfo.getMerchantId().intValue(), saleCodeConfig);
-			if(groupInfo.getStatus()==203){
-				codeCountByType=groupActService.selectUseAbleCountByType(groupInfo.getMerchantId().intValue(),
-						baseConfig.getSetsVersion(), groupInfo.getPaniniListId());
-			}
-		}
-
-		if(!tzyEnclosures.isEmpty()&&StringUtils.isEmpty(groupInfo.getCarouses())){
-			String urls = tzyEnclosures.stream().filter(file -> ("CarouseMap".equals(file.getCategory())))
-					.map(FileDto::getUrl).collect(Collectors.joining(","));
-			groupInfo.setCarouses(urls);
-		}
-		long unlockNUm=0;
-		if(groupInfo.isPreSale()){
-			unlockNUm=groupInfo.getSoldCopies()-noPayment-groupInfo.getRealSoldNum();
-			groupInfo.setSoldCopies(groupInfo.getRealSoldNum());
-		}else {
-			groupInfo.setSoldCopies(noPayment+groupInfo.getRealSoldNum());
-		}
-		//拼团积分
-		BigDecimal groupPoint = BigDecimal.ZERO;
-		if (user != null && StringUtils.isNotEmpty(groupInfo.getPointType())) {
-			Long point = mineApiService.getUserPointByType(user.getId(), groupInfo.getPointType(), groupInfo.getMerchantId().intValue());
-			groupPoint = new BigDecimal(point.toString()).divide(Constants.HUNDRED, 2, RoundingMode.HALF_DOWN);
-		}
-		String refSkuIds="";
-		Long refSpuId=null;
-		if (StringUtils.isNotEmpty(groupInfo.getPointType())) {
-			List<SimpleSku> skuList = groupApiService.getRefSkus(groupInfo.getId());
-			if (!CollectionUtils.isEmpty(skuList)) {
-				refSkuIds = skuList.stream().map(s -> s.getId().toString()).collect(Collectors.joining(","));
-				SimpleSku sku = skuList.get(0);
-				refSpuId = sku.getSpuId();
-				if (StringUtils.isEmpty(groupInfo.getGroupShowName())) {
-					groupInfo.setGroupShowName(sku.getSkuName());
-					groupInfo.setGroupShowImgs(sku.getCarouselImgUrl());
-				}
-			}
-		}
-		// 品牌会员信息
-		CommonBrandMemberDTO commonBrandMember = brandMemberBenefitsService.getBrandMemberDetails(groupInfo.getMerchantId(), user);
-		// 拼团是否有优惠券
-		boolean hasGroupCoupon = cardBaseInfoService.countByGroupInfoIdV2(id.longValue());
-		// 保证金缓存（3分钟）
-		MerchantBond merchantBond;
-		String key = "merchant_total_bond_" + groupInfo.getMerchantId();
-		if(redisUtils.hasKey(key)){
-			merchantBond = (MerchantBond) redisUtils.get(key);
-		}else{
-			merchantBond = merchantApiService.getMerchantBond(groupInfo.getMerchantId());
-			redisUtils.set(key, merchantBond, 180);
-		}
-		//todo 添加降级查询
-		return OutDTO.ok().put("groupInfo", groupInfo)
-				.put("favorablePrice", groupApiService.getLowActPrice(groupInfo.getUnitPrice(), groupInfo.getMarketingInfo()))
-				.put("marketing", marketing)
-				.put("userOrderId", userOrderId)
-				.put("minMaxPrice", minMaxPrice)
-				.put("noPayment", noPayment)
-				.put("unlockNUm", unlockNUm)
-				.put("goodsData", goodsData)
-				.put("userOrderNums", userOrderNums)
-				.put("merchantBond", merchantBond)
-				.put("confirmStatus", confirmStatus)
-				.put("baseConfig", isAdmin ? baseConfig : new ChecklistBaseConfigDto())
-				.put("custom", sysBaseService.selectChecklistBaseCustom(id))
-				.put("groupPoint", groupPoint)
-				.put("refSkuIds", refSkuIds)
-				.put("refSpuId", refSpuId)
-				.put("codeRecords", codeRecords)
-				.put("firstActConfig", isAdmin ? groupInfo.getFirstActConfig() : null)
-				.put("livingOpenAble", livingOpenAble)
-				.put("saleCodeConfig", saleCodeConfig)
-				.put("hasSaleCode", hasSaleCode)
-				.put("codeCountByType", codeCountByType)
-				.put("followFlag", mineApiService.isFollowed(Constants.GROUP_DETAIL_FOLLOW, id, inDto.getUserId()))
-				.put("commonBrandMember", commonBrandMember)
-				.put("hasGroupCoupon", hasGroupCoupon)
-				;
-	}
 	/**
 	 * 组团推荐
 	 *

tzy-sportcard/src/main/java/com/tzy/sportcard/api/controller/MineApiController.java

@@ -123,8 +123,6 @@ public class MineApiController {
     private ICardGroupLivesConfigService cardGroupLivesConfigService;
     @Autowired
     private ICardGroupGoodsService cardGroupGoodsService;
-    @Value("${pay.wxpay.app.appID}")
-    private String appid;
     @Autowired
     private ITzyShippingAddressService tzyShippingAddressService;
     @Autowired
@@ -146,8 +144,6 @@ public class MineApiController {
     private MerchantApiService merchantApiService;
     @Resource
     private IMemberBenefitsService memberBenefitsService;
-    @Autowired
-    private PayService payService;
     @Value("${tzy.idCardMaxNum:2}")
     private Integer idCardMaxNum;
     @Resource
@@ -583,9 +579,6 @@ public class MineApiController {
         //查询我的订单
         List<CardGroupOrderInfo> cardGroupOrderInfos = mineApiService.searchOrderInfos(cardGroupOrderInfo);
         cardGroupOrderInfos.forEach(order -> {
-            if (order.getInfoStatus() != null && order.getInfoStatus() > 204) {
-                addLiveInfo(order);
-            }
             if (order.getStatus() == 100) {
                 PayRecord payRecord = cardGroupOrderInfoService.findPayRecord(order.getId(), 1);
                 if (payRecord != null) {
@@ -610,27 +603,6 @@ public class MineApiController {
         return OutDTO.ok().buildPage(inDto,  orderCuntDto.getTotal(),"orderInfos", cardGroupOrderInfos);
     }
 
-    private void addLiveInfo(CardGroupOrderInfo order) {
-        Object o = redisUtils.hget(Constants.GROUP_PLAYBACKPATH ,Constants.GROUP_PLAYBACKPATH + order.getGroupInfoId());
-        if(o==null){
-            CardGroupLivesConfig cardGroupLivesConfig = new CardGroupLivesConfig();
-            cardGroupLivesConfig.setColumnsearch(" and status = 2 and group_info_id = " + order.getGroupInfoId());
-            List<CardGroupLivesConfig> cardGroupLivesConfigs = cardGroupLivesConfigService.selectCardGroupLivesConfigList(cardGroupLivesConfig);
-            if(!cardGroupLivesConfigs.isEmpty()){
-                CardGroupLivesConfig livesConfig = cardGroupLivesConfigs.get(0);
-                order.setPlaybackPath(livesConfig.getPlaybackPath());
-                order.setRoomId(livesConfig.getRoomid());
-                order.setJumpAppletFlag(appid.equals(livesConfig.getAppid()));
-                redisUtils.hset(Constants.GROUP_PLAYBACKPATH,Constants.GROUP_PLAYBACKPATH + order.getGroupInfoId(),livesConfig);
-            }
-        }else{
-            CardGroupLivesConfig liveCache=(CardGroupLivesConfig)o;
-            order.setPlaybackPath(liveCache.getPlaybackPath());
-            order.setRoomId(liveCache.getRoomid());
-            order.setJumpAppletFlag(false);
-        }
-    }
-
     /**
      * @return
      */
@@ -733,7 +705,6 @@ public class MineApiController {
         if(Constants.INFO_TYPE_SELECT_TEAM.equals(groupInfo.getType())){
             list=cardGroupOrderInfoService.selectOrderList(cardGroupOrderInfo.getId());
         }
-        addLiveInfo(cardGroupOrderInfo);
 
         Map orderStatus = mineApiService.checkOrderStatus(groupInfo, cardGroupOrderInfo, count > 0);
         boolean noGoods=false;
@@ -1876,50 +1847,6 @@ public class MineApiController {
         return OutDTO.ok();
     }
 
-    /**
-     * 继续支付-v2
-     * @param inDto
-     * @return
-     */
-    @ApiLog(title = "继续支付-v3",businessType = BusinessType.SEARCH,indto = "{{inDto}}")
-    @ResponseBody
-    @RequestMapping(value = "/v3/toPay", method = RequestMethod.POST)
-    public OutDTO toPayV3(@RequestBody InDto inDto){
-        AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-        //查询订单信息
-        Integer orderId = (Integer) inDto.get("orderId");
-        if (null == orderId) return OutDTO.error(10040, "参数[orderId]不能为空");
-        CardGroupOrderInfo orderInfo = cardGroupOrderInfoService.selectCardGroupOrderInfoById(orderId.longValue());
-        if (null == orderInfo) return OutDTO.error(10050, "未找到订单信息");
-        if (orderInfo.getActualPayment().doubleValue() <= 0) {
-            return OutDTO.error500("订单金额为零,不支持再次支付!");
-        }
-        if (System.currentTimeMillis() > orderInfo.getExpireTime().getTime()) {
-            return OutDTO.error(10050, "订单已超时");
-        }
-        Long groupInfoId = orderInfo.getGroupInfoId();
-        //1.查询团卡工单信息
-        CardGroupInfo cardGroupInfo = cardGroupInfoService.selectCardGroupInfoById(groupInfoId);
-        //判断组团
-        if (null == cardGroupInfo) return OutDTO.error(10040, "未找到组团信息");
-        // 唤起支付前做一个查询
-        if (cardGroupOrderInfoService.checkOrderIsPay(orderInfo.getId())) {
-            return OutDTO.error500("请勿重新支付!");
-        }
-        //支付子分类
-        String payType = inDto.getString("payType");
-        if ("merchant_pay".equals(payType)) {
-            return buildMerchantPayData(orderInfo, cardGroupInfo, payType);
-        }
-        String subType = getSubType(payType);
-        //银行卡需重新下单
-        if (subType.equals(orderInfo.getPaymentType()) && StringUtils.isNotEmpty(orderInfo.getPayData())
-                && !payType.contains("bank")) {
-            return buildPayAgainData(orderInfo, cardGroupInfo);
-        }
-        return payService.toPayV3(inDto, appUserInfoDto, orderInfo, cardGroupInfo );
-    }
-
 
     private  String getSubType(String payType) {
         String subType = "";
@@ -2159,44 +2086,6 @@ public class MineApiController {
         }
     }
 
-    /**
-     * 协议支付（银行卡）
-     *
-     * @param inDto
-     * @return
-     */
-    @ApiLog(title = "协议支付（银行卡）-v2", businessType = BusinessType.SEARCH, indto = "{{inDto}}")
-    @ResponseBody
-    @RequestMapping(value = "/v2/agreementPay", method = RequestMethod.POST)
-    public OutDTO agreementPayV2(@RequestBody InDto inDto) {
-        if (null == inDto) return OutDTO.error(10000, "参数不能为空");
-        AppUserInfoDto appUserInfoDto = mineApiService.checkUserNew(inDto);
-        inDto.setUserId(appUserInfoDto.getId());//重新设置userid
-        //查询订单信息
-        Object orderIdObj = inDto.get("orderId");
-        if(null == orderIdObj ) return OutDTO.error(10040,"参数[orderId]不能为空");
-        Integer orderId = (Integer) orderIdObj;
-        CardGroupOrderInfo orderInfo = cardGroupOrderInfoService.selectCardGroupOrderInfoById(Long.valueOf(orderId));
-        if(null == orderInfo)return OutDTO.error(10050,"未找到订单信息");
-
-        if(System.currentTimeMillis()>orderInfo.getExpireTime().getTime()){
-            return OutDTO.error(10050,"订单已超时");
-        }
-        Long groupInfoId = orderInfo.getGroupInfoId();
-        //1.查询团卡工单信息
-        CardGroupInfo cardGroupInfo = cardGroupInfoService.selectCardGroupInfoById(groupInfoId);
-        //判断组团
-        if(null == cardGroupInfo && "group".equals(orderInfo.getOrderType())) return OutDTO.error(10040,"未找到组团信息");
-        //判断是否超过限购
-        if(null != cardGroupInfo && !groupApiService.checkQuota(cardGroupInfo,inDto.getUserId(), 0)){
-            return OutDTO.error(20031, "超过限购");
-        }
-        inDto.put("orderInfo",orderInfo);//设置订单信息
-        inDto.put("cardGroupInfo",cardGroupInfo);//设置组团信息
-        inDto.put("appUserInfo",appUserInfoDto);//设置用户信息
-        return payService.agreementPayV2(inDto);
-    }
-
     @ApiVersion(1.0)
     @ApiOperation("新手引导")
     @PostMapping( "/{version}/check/guide")

tzy-sportcard/src/main/java/com/tzy/sportcard/api/service/PayService.java

@@ -1,34 +0,0 @@
-package com.tzy.sportcard.api.service;
-
-import com.tzy.app.domain.AppBaseUser;
-import com.tzy.common.dto.InDto;
-import com.tzy.common.dto.OutDTO;
-import com.tzy.sportcard.api.domain.AppUserInfoDto;
-import com.tzy.sportcard.group.domain.CardGroupInfo;
-import com.tzy.sportcard.group.domain.CardGroupOrderInfo;
-
-public interface PayService {
-
-    /**
-     * 协议支付（银行卡）
-     * @param inDto
-     * @return
-     */
-    public OutDTO agreementPayV2(InDto inDto);
-
-    public OutDTO getBankList(InDto inDto, AppUserInfoDto appUserInfoDto, CardGroupOrderInfo orderInfo, CardGroupInfo cardGroupInfo);
-
-    public OutDTO toPayV3(InDto inDto, AppUserInfoDto appUserInfoDto, CardGroupOrderInfo orderInfo, CardGroupInfo cardGroupInfo);
-    //获取支付方式
-    public OutDTO checkGoodsPayCat(InDto inDto,AppUserInfoDto appUserInfoDto);
-    //获取支付方式-支持香港支付
-    public OutDTO checkGoodsPayCatV2(InDto inDto,AppUserInfoDto appUserInfoDto);
-    //商城支付方式-v3 用户标签重构
-    public OutDTO checkGoodsPayCatV3(InDto inDto,AppUserInfoDto appUserInfoDto);
-    //订单预支付
-    public OutDTO orderPrePayV3(InDto inDto , AppUserInfoDto appUserInfoDto ,Long orderId,String category);
-    //订单预支付-新通道 新分配规则
-    public OutDTO orderPrePayV4(InDto inDto , AppUserInfoDto appUserInfoDto ,Long orderId,String category);
-    //对公转账-支付
-    OutDTO corporatePublicToPay(String version,InDto inDto, AppUserInfoDto appUserInfoDto);
-}

tzy-sportcard/src/main/java/com/tzy/sportcard/api/service/impl/GroupApiServiceImpl.java

@@ -169,8 +169,6 @@ public class GroupApiServiceImpl implements GroupApiService {
     private TzyCardBaseInfoMapper cardbaseInfoMapper;
     @Autowired
     private DataSourceTransactionManager transactionManager;
-    @Value("${pay.wxpay.app.appID}")
-    private String appId;
     @Value("${wx.work.appid:wwcca970d2ea347903}")
     private String workWXAppId;
     @Value("${wx.work.liveSecret:hlP6Ly3ZO2l4pefTqD-uSh3aTmh_ohHZVrJSE9ZHXag}")

tzy-sportcard/src/main/java/com/tzy/sportcard/api/service/impl/PayBackServiceImpl.java

@@ -79,8 +79,6 @@ public class PayBackServiceImpl implements IPayBackService {
 	private TzyCardBaseInfoMapper cardbaseInfoMapper;
 	@Autowired
 	private DataSourceTransactionManager transactionManager;
-	@Value("${pay.wxpay.app.appID}")
-	private String appId;
 	@Value("${coreService.baseurl:https://coresvc-dev.hobbystocks.cn}")
 	private String baseurl;
 	@Value("${coreService.appSmsUrl:/api/appmsg/live/on}")

tzy-sportcard/src/main/java/com/tzy/sportcard/group/service/ICardGroupOrderInfoService.java

@@ -202,14 +202,6 @@ public interface ICardGroupOrderInfoService {
 
     Integer selectUserOrderNums(Integer userId, Long infoId);
 
-    /**
-     * 预售订单申请退款
-     *
-     * @param userId
-     * @param orderId
-     */
-    void refundPreSaleOrder(Integer userId, Long orderId);
-
     List<SimpleUserShipDTO> getShippedCardByUser(NonEmptyQuery nonEmptyQuery);
 
     List<ExpressCourierNumDTO> getExpressCourierNumDTOS(Integer orderId);
@@ -264,8 +256,6 @@ public interface ICardGroupOrderInfoService {
 
     Long getArchivesIdByOrderId(Long id);
 
-    boolean updateOrderCorporatePublic(AppUserInfoDto appUserInfoDto, Integer orderId, String payVoucher);
-
     PageInfo<SimpleOrderDTO> getEcologyOrder(Integer pageNo, Integer pageSize, Integer userId);
 
     BigDecimal getEcologyAmount(Integer userId);