Răsfoiți Sursa

八大类代码上sit全部 增加bannner图 增加实体

ldz 1 săptămână în urmă
părinte
comite
ac20448392

+ 1 - 1
alien-entity/src/main/java/shop/alien/entity/store/StoreInfo.java

@@ -235,7 +235,7 @@ public class StoreInfo {
     @TableField("update_renew_contract_time")
     private Date  updateRenewContractTime;
 
-    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)")
+    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
     @TableField("business_classify")
     private String businessClassify;
 

+ 13 - 0
alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

@@ -1,5 +1,6 @@
 package shop.alien.entity.store.vo;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
@@ -236,4 +237,16 @@ public class StoreInfoVo extends StoreInfo {
 
     @ApiModelProperty(value = "分类名称")
     private List<String> businessClassifyNameList;
+
+
+    @ApiModelProperty(value = "身份证正面")
+    private JSONObject idcardFace;
+    @ApiModelProperty(value = "身份证反面")
+    private JSONObject idcardBack;
+    @ApiModelProperty(value = "经营许可证")
+    private JSONObject jyxkz;
+    @ApiModelProperty(value = "食品经营许可证")
+    private JSONObject foodLicence;
+    @ApiModelProperty(value = "娱乐经营许可证")
+    private JSONObject entertainmentLicence;
 }

+ 10 - 2
alien-store/src/main/java/shop/alien/store/controller/StoreInfoController.java

@@ -398,9 +398,17 @@ public class StoreInfoController {
     @GetMapping("/getStoreCouponList")
     @ResponseBody
     public R getStoreCouponList(@RequestParam("storeId") String storeId) {
-        log.info("StoreInfoController.getStoreDetail?storeId={},userId={}", storeId);
+        log.info("StoreInfoController.getStoreCouponList?storeId={}", storeId);
+        CouponAndEventVo couponAndEventVo = new CouponAndEventVo();
         List<LifeCouponVo> lifeCouponVos = storeInfoService.getStoreCouponList(storeId);
-        return R.data(lifeCouponVos);
+
+        List<StoreImg> storeImgs = storeInfoService.getBannerUrl(storeId);
+        couponAndEventVo.setCouponList(lifeCouponVos);
+        if (CollectionUtils.isNotEmpty(storeImgs)) {
+            couponAndEventVo.setMarketingList(storeImgs);
+        }
+        couponAndEventVo.setMarketingList(storeImgs);
+        return R.data(couponAndEventVo);
     }
 
     @ApiOperation(value = "web端审批店铺")