forked from angelo/java-retail-app
## 商品管理添加复购区域分红;
This commit is contained in:
parent
d2474562db
commit
c410d4faa4
|
@ -541,6 +541,7 @@ public class BdWaresController extends BaseController {
|
||||||
waresParams.setPkSpecialCurrency(waresExtend.getPkSpecialCurrency());
|
waresParams.setPkSpecialCurrency(waresExtend.getPkSpecialCurrency());
|
||||||
waresParams.setSortStatus(wares.getSortStatus());
|
waresParams.setSortStatus(wares.getSortStatus());
|
||||||
waresParams.setSystemType(waresExtend.getSystemType());
|
waresParams.setSystemType(waresExtend.getSystemType());
|
||||||
|
waresParams.setAreaIncome(wares.getAreaIncome());
|
||||||
if (waresExtend.getMakerIncome() != null) {
|
if (waresExtend.getMakerIncome() != null) {
|
||||||
R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
|
R<CurrencyDTO> currencyDto = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
|
||||||
waresParams.setMakerIncome(waresExtend.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
|
waresParams.setMakerIncome(waresExtend.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
|
||||||
|
|
|
@ -9,13 +9,6 @@ import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description:
|
|
||||||
* @Author: yuhui
|
|
||||||
* @Time: 2022/9/9 14:14
|
|
||||||
* @Classname: WaresParams
|
|
||||||
* @PackageName: com.hzs.sale.wares.controller.manage.params
|
|
||||||
*/
|
|
||||||
@Data
|
@Data
|
||||||
public class WaresParams implements Serializable {
|
public class WaresParams implements Serializable {
|
||||||
/**
|
/**
|
||||||
|
@ -416,4 +409,9 @@ public class WaresParams implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Integer waresStatus;
|
private Integer waresStatus;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 复购区域分红
|
||||||
|
*/
|
||||||
|
private BigDecimal areaIncome;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,9 +46,9 @@
|
||||||
<result column="DETAILS_TYPE" property="detailsType"/>
|
<result column="DETAILS_TYPE" property="detailsType"/>
|
||||||
<result column="AFTER_GUARANTEE" property="afterGuarantee"/>
|
<result column="AFTER_GUARANTEE" property="afterGuarantee"/>
|
||||||
<result column="giftNames" property="giftNames"/>
|
<result column="giftNames" property="giftNames"/>
|
||||||
<result column="maker_income" property="makerIncome"/>
|
|
||||||
<result column="PK_SPECIAL_CURRENCY" property="pkSpecialCurrency"/>
|
<result column="PK_SPECIAL_CURRENCY" property="pkSpecialCurrency"/>
|
||||||
<result column="SYSTEM_TYPE" property="systemType"/>
|
<result column="SYSTEM_TYPE" property="systemType"/>
|
||||||
|
<result column="AREA_INCOME" property="areaIncome"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<resultMap id="resultMap" type="com.hzs.sale.wares.vo.WaresVo">
|
<resultMap id="resultMap" type="com.hzs.sale.wares.vo.WaresVo">
|
||||||
|
|
|
@ -216,4 +216,10 @@ public class BdWares extends BaseEntity {
|
||||||
@TableField("SYSTEM_TYPE")
|
@TableField("SYSTEM_TYPE")
|
||||||
private Integer systemType;
|
private Integer systemType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 复购区域分红
|
||||||
|
*/
|
||||||
|
@TableField("AREA_INCOME")
|
||||||
|
private BigDecimal areaIncome;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue