测试3
This commit is contained in:
parent
9fa45e9f58
commit
8f4f27a769
|
@ -202,11 +202,14 @@ public class BusStoreInfoController extends BaseController {
|
|||
if(content.contains(busTemplateAttrInfo.getAttrValue())){
|
||||
content = content.replaceAll("#name",busStoreInfo.getStoreName());
|
||||
content = content.replaceAll("#from",busStoreInfo.getPlatformType());
|
||||
content = content.replaceAll("#date", LocalDate.now().toString());
|
||||
content = content.replaceAll("#date", LocalDate.now().minusDays(1).toString());
|
||||
content = content.replaceAll("#count",busStoreDayInfo1.getLastOrderNum()+"");
|
||||
content = content.replaceAll("#good",busStoreDayInfo1.getLastPositiveReviewsNum()+"");
|
||||
content = content.replaceAll("#five",busStoreDayInfo1.getLastFiveStarReviewsNum()+"");
|
||||
content = content.replaceAll("#score",busStoreDayInfo1.getScore());
|
||||
if(content.contains("#fee")&&busStoreInfo.getPrice() == null){
|
||||
throw new ServiceException("请设置单价!");
|
||||
}
|
||||
content = content.replaceAll("#fee",busStoreInfo.getPrice().multiply(new BigDecimal(busStoreDayInfo1.getLastFiveStarReviewsNum()))+"");
|
||||
}
|
||||
}
|
||||
|
|
|
@ -122,6 +122,8 @@ public class BusTemplateInfoServiceImpl implements IBusTemplateInfoService
|
|||
List<BusTemplateAttrInfo> list1 = busTemplateAttrInfoMapper.selectBusTemplateAttrInfoList(busTemplateAttrInfo);
|
||||
busTemplateInfo1.setAttrInfoList(list1);
|
||||
return busTemplateInfo1;
|
||||
}else if(list.size() == 0){
|
||||
throw new ServiceException("请添加/编辑模版!");
|
||||
}
|
||||
throw new ServiceException("模版信息异常!");
|
||||
}
|
||||
|
|
|
@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="selectBusStoreInfoList" parameterType="BusStoreInfo" resultMap="BusStoreInfoResult">
|
||||
<include refid="selectBusStoreInfoVo"/>
|
||||
<where>
|
||||
self_delivery_status != '3'
|
||||
<if test="platformType != null and platformType != ''"> and platform_type = #{platformType}</if>
|
||||
<if test="storeCode != null and storeCode != ''"> and store_code = #{storeCode}</if>
|
||||
<if test="storeName != null and storeName != ''"> and store_name like concat('%', #{storeName}, '%')</if>
|
||||
|
|
|
@ -393,7 +393,6 @@
|
|||
<el-button @click="cancel2">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<div id="copyText" type="hidden">{{ copyText }}</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
@ -465,7 +464,6 @@ export default {
|
|||
children: "children",
|
||||
label: "label"
|
||||
},
|
||||
copyText: "",
|
||||
// 表单校验
|
||||
rules: {
|
||||
// storeCode: undefined,
|
||||
|
|
Loading…
Reference in New Issue