Просмотр исходного кода

Merge branch 'release_real_202103' of https://git.malls.iformall.com/server/formallProject into release_real_202103

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
04fd362521
13 измененных файлов: 84 добавлений и 22 удалений
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java
  3. +10
    -1
      mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
  5. +2
    -1
      mallinkService/src/main/java/com/iformall/utils/sign/SignUtils.java
  6. +6
    -6
      mallinkService/src/main/resources/mapper/TtCouponMapper.xml
  7. +8
    -2
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
  8. +3
    -3
      mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java
  9. +1
    -1
      mallinkTTAdmin/src/main/resources/application.yml
  10. +6
    -0
      mallinkTTCApi/pom.xml
  11. +24
    -0
      mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java
  12. +9
    -4
      mallinkTTCApi/src/main/resources/application-dev.yml
  13. +9
    -4
      mallinkTTCApi/src/main/resources/application-prod.yml

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -219,6 +219,8 @@ public class WxMerchant extends TenantEntity {
private String carParams; private String carParams;
@io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId")
private Integer businessId; private Integer businessId;
@io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessTypes")
private String businessTypes;
@io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId") @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId")
private Integer subBusinessId; private Integer subBusinessId;
@io.swagger.annotations.ApiModelProperty(value="店铺类型:1直营店2加盟店3个体店4旗舰店",name="shopType") @io.swagger.annotations.ApiModelProperty(value="店铺类型:1直营店2加盟店3个体店4旗舰店",name="shopType")


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java Просмотреть файл

@@ -61,4 +61,7 @@ public interface TtCouponService {
ResultData auditRejected(Long id); ResultData auditRejected(Long id);




int addSeeCount(Long id);

int addSellCount(Long id);
} }

+ 10
- 1
mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java Просмотреть файл

@@ -135,7 +135,6 @@ public class TtCouponServiceImpl implements TtCouponService {
// WxMerchant author = wxMerchantMapper.selectById(byId.getMerchantId()); // WxMerchant author = wxMerchantMapper.selectById(byId.getMerchantId());
// byId.setMerchantName(author.getName()); // byId.setMerchantName(author.getName());
// byId.setMerchantPic(author.getImgUrl()); // byId.setMerchantPic(author.getImgUrl());

byId.setAuthor(wxMerchantMapper.selectById(byId.getMerchantId())); byId.setAuthor(wxMerchantMapper.selectById(byId.getMerchantId()));
if(byId.getType().equals(EnumTtCouponType.COUPON_COLUMN.getCode())){ if(byId.getType().equals(EnumTtCouponType.COUPON_COLUMN.getCode())){
TtCoupon couponQ = new TtCoupon(); TtCoupon couponQ = new TtCoupon();
@@ -277,4 +276,14 @@ public class TtCouponServiceImpl implements TtCouponService {
ttCouponMapper.updateById(byId); ttCouponMapper.updateById(byId);
return new ResultData(); return new ResultData();
} }

@Override
public int addSeeCount(Long id) {
return ttCouponMapper.addSeeCount(id);
}

@Override
public int addSellCount(Long id) {
return ttCouponMapper.addSellCount(id);
}
} }

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java Просмотреть файл

@@ -114,6 +114,7 @@ public class TtOrderServiceImpl implements TtOrderService {
order.setCreateDate(now); order.setCreateDate(now);
order.setUpdateDate(now); order.setUpdateDate(now);
ttOrderMapper.insert(order); ttOrderMapper.insert(order);
ttCouponService.addSellCount(coupon.getId());
return new ResultData(order); return new ResultData(order);
} catch (MallinkException e) { } catch (MallinkException e) {
logger.error(e.getMessage()); logger.error(e.getMessage());


+ 2
- 1
mallinkService/src/main/java/com/iformall/utils/sign/SignUtils.java Просмотреть файл

@@ -40,7 +40,8 @@ public class SignUtils {
if ("MD5".equals(signMethod)) { if ("MD5".equals(signMethod)) {
return getMD5(signStr.toString()); return getMD5(signStr.toString());
} else { } else {
return getSHA(signStr.toString());
// return getSHA(signStr.toString());
return encrypt(signStr.toString(),signMethod);
} }
} }




+ 6
- 6
mallinkService/src/main/resources/mapper/TtCouponMapper.xml Просмотреть файл

@@ -147,27 +147,27 @@
</delete> </delete>


<update id="addSeeCount" parameterType="Long"> <update id="addSeeCount" parameterType="Long">
update tt_coupon SET see_count = see_count+1, update_date=now() where id = #{id}
update tt_coupon SET see_count = see_count+1,popularity = popularity+1, update_date=now() where id = #{id}
</update> </update>


<update id="addSellCount" parameterType="Long"> <update id="addSellCount" parameterType="Long">
update tt_coupon SET sell_count = sell_count+1, false_sell_count = false_sell_count+1, update_date=now() where id = #{id}
update tt_coupon SET sell_count = sell_count+1,popularity = popularity+20, false_sell_count = false_sell_count+1, update_date=now() where id = #{id}
</update> </update>


<update id="reduceSellCount" parameterType="Long"> <update id="reduceSellCount" parameterType="Long">
update tt_coupon SET sell_count = sell_count-1, false_sell_count = false_sell_count-1, update_date=now() where id = #{id}
update tt_coupon SET sell_count = sell_count-1,popularity = popularity-20, false_sell_count = false_sell_count-1, update_date=now() where id = #{id}
</update> </update>


<update id="addAssessCount" parameterType="Long"> <update id="addAssessCount" parameterType="Long">
update tt_coupon SET assess_count = assess_count+1, update_date=now() where id = #{id}
update tt_coupon SET assess_count = assess_count+1,popularity = popularity+10, update_date=now() where id = #{id}
</update> </update>


<update id="addCollectCount" parameterType="Long"> <update id="addCollectCount" parameterType="Long">
update tt_coupon SET collect_count = collect_count+1, update_date=now() where id = #{id}
update tt_coupon SET collect_count = collect_count+1,popularity = popularity+5, update_date=now() where id = #{id}
</update> </update>


<update id="reduceCollectCount" parameterType="Long"> <update id="reduceCollectCount" parameterType="Long">
update tt_coupon SET collect_count = collect_count-1, update_date=now() where id = #{id}
update tt_coupon SET collect_count = collect_count-1,popularity = popularity-5, update_date=now() where id = #{id}
</update> </update>


<update id="addPopularity" parameterType="java.util.HashMap"> <update id="addPopularity" parameterType="java.util.HashMap">


+ 8
- 2
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Просмотреть файл

@@ -16,6 +16,8 @@
<result column="status" jdbcType="INTEGER" property="status"/> <result column="status" jdbcType="INTEGER" property="status"/>
<result column="link_person" jdbcType="VARCHAR" property="linkPerson"/> <result column="link_person" jdbcType="VARCHAR" property="linkPerson"/>
<result column="business_id" jdbcType="INTEGER" property="businessId"/> <result column="business_id" jdbcType="INTEGER" property="businessId"/>
<result column="business_types" jdbcType="VARCHAR" property="businessTypes"/>

<result column="sub_business_id" jdbcType="INTEGER" property="subBusinessId"/> <result column="sub_business_id" jdbcType="INTEGER" property="subBusinessId"/>
<result column="shop_type" jdbcType="INTEGER" property="shopType"/> <result column="shop_type" jdbcType="INTEGER" property="shopType"/>
<result column="brand" jdbcType="VARCHAR" property="brand"/> <result column="brand" jdbcType="VARCHAR" property="brand"/>
@@ -43,13 +45,13 @@
<sql id="allColumns"> <sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`img_url`,`name`,`encode`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `id`,`tenant_id`,`parent_tenant_id`,`img_url`,`name`,`encode`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`,
`business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`,
`business_id`,`business_types`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`,
`introduction`,`action_desc`,`is_del`,`talk_user_main`,`talk_user_aux`,link_line_phone,credit_locked,cash_out_number,cash_out_count,cash_out_last_time `introduction`,`action_desc`,`is_del`,`talk_user_main`,`talk_user_aux`,link_line_phone,credit_locked,cash_out_number,cash_out_count,cash_out_last_time
</sql> </sql>
<sql id="allColumnsVo"> <sql id="allColumnsVo">
m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`,
m.`business_id`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,
m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,
m.`introduction`,m.`action_desc`,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,r.rental_start_date,r.rental_end_date,m.cash_out_number,m.cash_out_count,m.cash_out_last_time m.`introduction`,m.`action_desc`,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,r.rental_start_date,r.rental_end_date,m.cash_out_number,m.cash_out_count,m.cash_out_last_time
</sql> </sql>
@@ -99,6 +101,10 @@
and `business_id` = #{businessId} and `business_id` = #{businessId}
</if> </if>


<if test=" null != businessTypes ">
and JSON_CONTAINS(business_types,JSON_OBJECT('id', #{businessTypes}))
</if>

<if test=" null != subBusinessId "> <if test=" null != subBusinessId ">
and `sub_business_id` = #{subBusinessId} and `sub_business_id` = #{subBusinessId}
</if> </if>


+ 3
- 3
mallinkTTAdmin/src/main/java/com/iformall/controller/video/VideoController.java Просмотреть файл

@@ -72,7 +72,7 @@ public class VideoController extends BaseController {
* @throws Exception * @throws Exception
*/ */
@GetMapping(value = "/uploadProgress") @GetMapping(value = "/uploadProgress")
@ApiOperation("上传视频进度")
@ApiOperation("上传视频进度大小")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)})
public ResultData uploadProgress(String videoId) { public ResultData uploadProgress(String videoId) {
@@ -93,7 +93,7 @@ public class VideoController extends BaseController {
* @throws Exception * @throws Exception
*/ */
@GetMapping(value = "/videoContentLength") @GetMapping(value = "/videoContentLength")
@ApiOperation("上传视频进度")
@ApiOperation("上传视频大小")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)})
public ResultData videoContentLength(String videoId) { public ResultData videoContentLength(String videoId) {
@@ -114,7 +114,7 @@ public class VideoController extends BaseController {
* @throws Exception * @throws Exception
*/ */
@GetMapping(value = "/videoDetial") @GetMapping(value = "/videoDetial")
@ApiOperation("上传视频进度")
@ApiOperation("上传视频详情")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)}) @ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)})
public ResultData videoDetial(String videoId) { public ResultData videoDetial(String videoId) {


+ 1
- 1
mallinkTTAdmin/src/main/resources/application.yml Просмотреть файл

@@ -45,7 +45,7 @@ spring:
auto: true auto: true
flyway: flyway:
locations: classpath:/db/migration locations: classpath:/db/migration
baseline-on-migrate: true
enabled: false
baseline-version: 1 baseline-version: 1






+ 6
- 0
mallinkTTCApi/pom.xml Просмотреть файл

@@ -18,6 +18,12 @@
<version>1.0</version> <version>1.0</version>
</dependency> </dependency>


<dependency>
<groupId>com.iformall</groupId>
<artifactId>mallinkVideo</artifactId>
<version>1.0</version>
</dependency>

</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>


+ 24
- 0
mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java Просмотреть файл

@@ -8,6 +8,8 @@ import com.iformall.enums.EnumTtCouponStatus;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantService;
import com.iformall.service.tt.TtCouponService; import com.iformall.service.tt.TtCouponService;
import com.iformall.video.VideoFactory;
import com.iformall.video.entity.VideUploadResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -30,6 +32,12 @@ public class TtCouponController extends BaseController {
@Autowired @Autowired
private WxMerchantService wxMerchantService; private WxMerchantService wxMerchantService;


@Autowired
private VideoFactory videoFactory;

@Autowired
String videoType;

@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@ApiImplicitParams({ @ApiImplicitParams({
@@ -50,9 +58,25 @@ public class TtCouponController extends BaseController {
if (id == null) { if (id == null) {
return new ResultData(ResultData.ERROR, "缺少id"); return new ResultData(ResultData.ERROR, "缺少id");
} }
ttCouponService.addSeeCount(id);
return new ResultData(ttCouponService.detail(id)); return new ResultData(ttCouponService.detail(id));
} }


@GetMapping(value = "/videoDetial")
@ApiOperation("上传视频详情")
@ApiImplicitParams({
@ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)})
public ResultData videoDetial(String videoId) {
try {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetail(videoId);
return new ResultData(videoDetail);
} catch (Exception e) {
logger.error(e.getMessage());
return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR);
}
}


@ApiOperation("是否收藏") @ApiOperation("是否收藏")
@GetMapping("/iscollect") @GetMapping("/iscollect")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)


+ 9
- 4
mallinkTTCApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -160,10 +160,15 @@ alipay:
callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback
video: video:
aliyun:
accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V
accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry
regionId: cn-beijing
aliyun:
accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V
accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry
regionId: cn-beijing
endPoint: https://oss-cn-beijing.aliyuncs.com
corePoolSize: 6
maxPoolSize: 20
queueCapacity: 1000
namePrefix: aliyun-video-upload


jasypt: jasypt:
encryptor: encryptor:


+ 9
- 4
mallinkTTCApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -119,10 +119,15 @@ alipay:
callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback callback: https://callbacktest.malls.iformall.com/api/alipay/notify/callback
video: video:
aliyun:
accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V
accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry
regionId: cn-beijing
aliyun:
accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V
accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry
regionId: cn-beijing
endPoint: https://oss-cn-beijing.aliyuncs.com
corePoolSize: 6
maxPoolSize: 20
queueCapacity: 1000
namePrefix: aliyun-video-upload


fm: fm:
exception: true exception: true


Загрузка…
Отмена
Сохранить