Browse Source

//..

private_deployment
xhxu 1 year ago
parent
commit
67cac1f027
4 changed files with 34 additions and 19 deletions
  1. +23
    -16
      suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java
  2. +3
    -0
      suimangService/src/main/java/com/iformall/domain/po/sm/DigitalAvatarMould.java
  3. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/UserDigitalAvatarPhotoServiceImpl.java
  4. +7
    -2
      suimangService/src/main/resources/mapper/DigitalAvatarMouldMapper.xml

+ 23
- 16
suimangCApi/src/main/java/com/iformall/controller/CallbackSmController.java View File

@@ -8,6 +8,7 @@ import com.iformall.domain.po.sm.*;
import com.iformall.enums.EnumDigitalAvatarOrderStatus;
import com.iformall.enums.EnumDigitalAvatarPhotoStatus;
import com.iformall.enums.EnumVideoStatus;
import com.iformall.exception.MallinkException;
import com.iformall.service.sm.*;
import com.iformall.utils.Base64Util;
import io.swagger.annotations.Api;
@@ -179,25 +180,31 @@ public class CallbackSmController extends BaseController {
if (userDigitalAvatarOrder == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到任务数据");
}
try{
if("2000".equals(code)){
Map<String,String> data = (Map) paranMap.get("data");
List<String> imgList = new ArrayList<>();
imgList.add(data.get("img_0"));
imgList.add(data.get("img_1"));
imgList.add(data.get("img_2"));
imgList.add(data.get("img_3"));
userDigitalAvatarPhotoService.handlePhoto(userDigitalAvatarOrder,imgList);
}else{
UserDigitalAvatarOrder updOrder = new UserDigitalAvatarOrder();
updOrder.setId(userDigitalAvatarOrder.getId());
updOrder.setStatus(EnumDigitalAvatarOrderStatus.fail.getCode());
updOrder.setMsg(msg);
updOrder.setUpdateDate(new Date());
userDigitalAvatarOrderService.updateById(updOrder);
}

if("2000".equals(code)){
Map<String,String> data = (Map) paranMap.get("data");
List<String> imgList = new ArrayList<>();
imgList.add(data.get("img_0"));
imgList.add(data.get("img_1"));
imgList.add(data.get("img_2"));
imgList.add(data.get("img_3"));
userDigitalAvatarPhotoService.handlePhoto(userDigitalAvatarOrder,imgList);
}else{
UserDigitalAvatarOrder updOrder = new UserDigitalAvatarOrder();
updOrder.setId(userDigitalAvatarOrder.getId());
updOrder.setStatus(EnumDigitalAvatarOrderStatus.fail.getCode());
updOrder.setMsg(msg);
updOrder.setUpdateDate(new Date());
userDigitalAvatarOrderService.updateById(updOrder);
return new ResultData();
}catch(MallinkException e){
return new ResultData(e.getErrorCode(),e.getMessage());
}catch(Exception e){
return new ResultData(ErrorCode.SYS_SERVER_ERROR);
}

return new ResultData();
}

@AuthIgnore


+ 3
- 0
suimangService/src/main/java/com/iformall/domain/po/sm/DigitalAvatarMould.java View File

@@ -85,6 +85,9 @@ public class DigitalAvatarMould extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark")
private String remark;

@io.swagger.annotations.ApiModelProperty(value="EnumSex",name="sex")
private Integer sex;

@io.swagger.annotations.ApiModelProperty(value="EnumDigitalAvatarMouldType",name="mouldType")
private Integer mouldType;



+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/UserDigitalAvatarPhotoServiceImpl.java View File

@@ -194,7 +194,7 @@ public class UserDigitalAvatarPhotoServiceImpl implements UserDigitalAvatarPhoto
final IdWorker idWorker = IdWorker.get();
for (String img: imgList) {
InputStream inputStream = Base64Util.base2InputStream(img);
String img_url = aliyunOSS.upload(record.getTenantId(), ".png", inputStream);
String img_url = aliyunOSS.upload(record.getTenantId(), ".jpg", inputStream);

UserDigitalAvatarPhoto userDigitalAvatarPhoto = new UserDigitalAvatarPhoto();
userDigitalAvatarPhoto.setId(idWorker.nextId());


+ 7
- 2
suimangService/src/main/resources/mapper/DigitalAvatarMouldMapper.xml View File

@@ -16,6 +16,7 @@
<result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="mould_type" jdbcType="INTEGER" property="mouldType"/>
<result column="sex" jdbcType="INTEGER" property="sex"/>
<result column="mould_sm_id" jdbcType="VARCHAR" property="mouldSmId"/>
<result column="again_count" jdbcType="INTEGER" property="againCount"/>
<result column="status" jdbcType="INTEGER" property="status"/>
@@ -27,7 +28,7 @@
<sql id="allColumns">
`id`, `tenant_id`, `parent_tenant_id`, `cover_img`, `cover_picture`, `detail_picture`,
`title`, `sub_title`, `scene_sign`, `sale_price`, `price`,
`detail`, `remark`, `mould_type`, `mould_sm_id`, `again_count`,
`detail`, `remark`, `mould_type`, `sex`, `mould_sm_id`, `again_count`,
`status`, `puton_date`, `create_date`, `update_date`
</sql>

@@ -57,6 +58,10 @@
and `mould_type` = #{mouldType}
</if>

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

<if test=" null != status">
and `status` = #{status}
</if>
@@ -93,7 +98,7 @@
select
`id`, `cover_img`, `cover_picture`,
`title`, `sub_title`, `scene_sign`, `sale_price`, `price`,
`mould_type`, `mould_sm_id`,
`mould_type`,`sex`, `mould_sm_id`,
`status`, `create_date`, `update_date`
from digital_avatar_mould
<include refid="dynamicWhereConditions"/>


Loading…
Cancel
Save