Преглед изворни кода

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

release_toaliyun_real
lin пре 3 година
родитељ
комит
98ad865a68
4 измењених фајлова са 32 додато и 13 уклоњено
  1. +21
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java
  3. +8
    -7
      mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java
  4. +2
    -2
      mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml

+ 21
- 3
mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java Прегледај датотеку

@@ -7,11 +7,14 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.TtGoodsCategory;
import com.iformall.domain.po.WxMall;
import com.iformall.domain.vo.TtMallGoodsCategoryVo;
import com.iformall.service.TtGoodsCategoryService;
import com.iformall.service.TtMallGoodsCategoryService;
import com.iformall.service.WxMallService;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,16 +32,24 @@ public class TtMallGoodsCategoryController extends BaseController {
@Autowired
private TtMallGoodsCategoryService ttMallGoodsCategoryService;

@Autowired
private WxMallService wxMallService;


@TenantIgnore
@ApiOperation("分页列表接口")
@GetMapping("allTreeList")
@ApiImplicitParams({})
@SystemControllerLog(description = "列表")
public ResultData allTreeList() {
public ResultData allTreeList(String tenantId) {
logger.debug("[" + getIpAddr() + "] TtMerchantPoiController::allTreeList");
return new ResultData(ttMallGoodsCategoryService.findAllTreeList(getTenantInfo()));
if(StringUtils.isBlank(tenantId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId 为null");
}
return new ResultData(ttMallGoodsCategoryService.findAllTreeList(tenantId));
}

@TenantIgnore
@ApiOperation("设置软件服务费")
@PostMapping("setMallSoftwareFee")
@ApiImplicitParams({})
@@ -48,7 +59,14 @@ public class TtMallGoodsCategoryController extends BaseController {
if(record.getCategoryId() == null || record.getMallSoftwareFee() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
record.updateTenantInfo(getTenantInfo());
if(record.getTenantId() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId 为null");
}
WxMall mall = wxMallService.getByTenantId(record.getTenantId());
if(mall == null){
return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);
}
record.updateTenantInfo(mall);

ttMallGoodsCategoryService.updateFee(record);
return new ResultData();


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java Прегледај датотеку

@@ -10,7 +10,7 @@ import java.util.List;

public interface TtMallGoodsCategoryService {

List<TtMallGoodsCategoryVo> findAllTreeList(TenantEntity tenantInfo);
List<TtMallGoodsCategoryVo> findAllTreeList(String tenantId);

void updateFee(TtMallGoodsCategoryVo record);



+ 8
- 7
mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java Прегледај датотеку

@@ -40,9 +40,10 @@ public class TtMallGoodsCategoryServiceImpl implements TtMallGoodsCategoryServic


@Override
public List<TtMallGoodsCategoryVo> findAllTreeList(TenantEntity tenantInfo) {
public List<TtMallGoodsCategoryVo> findAllTreeList(String tenantId) {
TtMallGoodsCategoryVo mgcVoQ = new TtMallGoodsCategoryVo();
mgcVoQ.updateTenantInfo(tenantInfo);
// mgcVoQ.updateTenantInfo(tenantInfo);
mgcVoQ.setTenantId(tenantId);
mgcVoQ.setIsDel(EnumYesOrNo.NO.getCode());
mgcVoQ.setSortColumns(BaseEntity.SortField.Id_ASC);
List<TtMallGoodsCategoryVo> listAll = ttMallGoodsCategoryMapper.findAllTreeList(mgcVoQ);
@@ -141,11 +142,11 @@ public class TtMallGoodsCategoryServiceImpl implements TtMallGoodsCategoryServic
List<TtMallGoodsCategory> childList = new ArrayList<>();
for (Integer childId:childIds) {
TtMallGoodsCategory child = new TtMallGoodsCategory();
old.setGoodsCategoryId(childId);
old.updateTenantInfo(tenantEntity);
old.setSoftwareFee(softwareFee);
old.setCreateDate(now);
old.setUpdateDate(now);
child.setGoodsCategoryId(childId);
child.updateTenantInfo(tenantEntity);
child.setSoftwareFee(softwareFee);
child.setCreateDate(now);
child.setUpdateDate(now);
childList.add(child);
}
ttMallGoodsCategoryMapper.insertList(childList);


+ 2
- 2
mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml Прегледај датотеку

@@ -71,7 +71,7 @@
(#{item.goodsCategoryId,jdbcType=INTEGER},
#{item.tenantId,jdbcType=VARCHAR},
#{item.parentTenantId,jdbcType=VARCHAR},
#{item.software_fee,jdbcType=INTEGER},
#{item.softwareFee,jdbcType=INTEGER},
#{item.createDate,jdbcType=TIMESTAMP},
#{item.updateDate,jdbcType=TIMESTAMP})
</foreach>
@@ -81,7 +81,7 @@


<resultMap id="BaseResultMapVo" type="com.iformall.domain.vo.TtMallGoodsCategoryVo">
<result column="id" jdbcType="INTEGER" property="id" />
<result column="id" jdbcType="INTEGER" property="categoryId" />
<result column="level" jdbcType="INTEGER" property="level" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="parent_id" jdbcType="INTEGER" property="parentId" />


Loading…
Откажи
Сачувај