| src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java | ●●●●● patch | view | raw | blame | history | |
| src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/mapper/modules/MallMemberMapper.xml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/mapper/modules/MallOrderInfoMapper.xml | ●●●●● patch | view | raw | blame | history | |
| src/main/resources/templates/febs/views/modules/system/systemSetting.html | ●●●●● patch | view | raw | blame | history |
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -16,6 +16,7 @@ import cc.mrbird.febs.monitor.service.ILoginLogService; import cc.mrbird.febs.system.service.IUserService; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; @@ -76,6 +77,18 @@ return FebsUtil.view("modules/system/scorePoorSetting"); } @GetMapping("systemSetting") @RequiresPermissions("systemSetting:update") public String systemSetting(Model model) { DataDictionaryCustom returnPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( DataDictionaryEnum.RETURN_PERCENT.getType(), DataDictionaryEnum.RETURN_PERCENT.getCode()); if (ObjectUtil.isNotEmpty(returnPercentDic)) { model.addAttribute("returnPercent", returnPercentDic.getValue()); } return FebsUtil.view("modules/system/systemSetting"); } @GetMapping("indexData") @RequiresPermissions("indexData:view") public String indexData(Model model) { src/main/java/cc/mrbird/febs/mall/dto/OrderListDto.java
@@ -24,7 +24,7 @@ @ApiModelProperty(value = "订单全状态", example = "全部不用传 2-进行中 3-已完成") private Integer allStatus; @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-已完成 5-已取消") @ApiModelProperty(value = "订单状态", example = "0-全部 1-待付款 2-待发货 3-待收货 4-已完成 5-已取消 6-待评价") private Integer status; @ApiModelProperty(hidden = true) src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -119,7 +119,7 @@ String yyyyMMdd = sdf.format(date); Integer times = this.baseMapper.selectCountByCreateTimeAndMemberId(yyyyMMdd,member.getId()); if(buyTimes <= times){ throw new FebsException("会员今日已无法购买"); throw new FebsException("今日任务完成,明天再来"); } String orderNo = MallUtils.getOrderNum(); @@ -506,22 +506,22 @@ orderInfo.setStatus(OrderStatusEnum.FINISH.getValue()); orderInfo.setReceivingTime(new Date()); this.baseMapper.updateById(orderInfo); /** * 通过支付流水记录，返回下单金额 */ MallMoneyFlow payFlow = mallMoneyFlowMapper.selectOneByMemberIdAndOrderNoAndTypeAndStatusAndIsReturn( member.getId(), orderInfo.getOrderNo(), MallMoneyFlowTypeEnum.PAY.getCode(), MallMoneyFlow.STATUS_SUCCESS, MallMoneyFlow.IS_RETURN_N); if(ObjectUtil.isNotEmpty(payFlow)){ memberWalletService.addBalance(payFlow.getAmount().negate(),payFlow.getRtMemberId()); payFlow.setIsReturn(MallMoneyFlow.IS_RETURN_Y); mallMoneyFlowMapper.updateById(payFlow); } //产生补贴流水记录 agentProducer.sendDirectRewardMsg(orderInfo.getId()); // /** // * 通过支付流水记录，返回下单金额 // */ // MallMoneyFlow payFlow = mallMoneyFlowMapper.selectOneByMemberIdAndOrderNoAndTypeAndStatusAndIsReturn( // member.getId(), // orderInfo.getOrderNo(), // MallMoneyFlowTypeEnum.PAY.getCode(), // MallMoneyFlow.STATUS_SUCCESS, // MallMoneyFlow.IS_RETURN_N); // if(ObjectUtil.isNotEmpty(payFlow)){ // memberWalletService.addBalance(payFlow.getAmount().negate(),payFlow.getRtMemberId()); // payFlow.setIsReturn(MallMoneyFlow.IS_RETURN_Y); // mallMoneyFlowMapper.updateById(payFlow); // } // //产生补贴流水记录 // agentProducer.sendDirectRewardMsg(orderInfo.getId()); } @@ -655,6 +655,22 @@ orderInfo.setCommentState(MallOrderInfo.COMMENT_STATE_YES); this.baseMapper.updateById(orderInfo); /** * 通过支付流水记录，返回下单金额 */ MallMoneyFlow payFlow = mallMoneyFlowMapper.selectOneByMemberIdAndOrderNoAndTypeAndStatusAndIsReturn( member.getId(), orderInfo.getOrderNo(), MallMoneyFlowTypeEnum.PAY.getCode(), MallMoneyFlow.STATUS_SUCCESS, MallMoneyFlow.IS_RETURN_N); if(ObjectUtil.isNotEmpty(payFlow)){ memberWalletService.addBalance(payFlow.getAmount().negate(),payFlow.getRtMemberId()); payFlow.setIsReturn(MallMoneyFlow.IS_RETURN_Y); mallMoneyFlowMapper.updateById(payFlow); } //产生补贴流水记录 agentProducer.sendDirectRewardMsg(orderInfo.getId()); List<ApiAddCommentDto> apiAddCommentDtos = addCommentDtos.getApiAddCommentDtos(); if(CollUtil.isNotEmpty(apiAddCommentDtos)){ src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -358,6 +358,7 @@ inner join mall_member b on a.member_id=b.ID where 1=1 and a.status = 4 and a.comment_state = 2 <if test="type == 1"> and b.invite_id=#{inviteId} </if> src/main/resources/mapper/modules/MallOrderInfoMapper.xml
@@ -151,6 +151,9 @@ <if test="record.query != null and record.query != ''"> and (b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.style_name like CONCAT('%', CONCAT(#{record.query}, '%')) or b.sku_name like CONCAT('%', CONCAT(#{record.query}, '%'))) </if> <if test="record.status == 6 and record.status != 0"> and a.status = 4 and a.comment_state = 1 </if> <if test="record.status == 4 and record.status != 0"> and a.status = 4 </if> @@ -167,10 +170,10 @@ and a.order_type=#{record.orderType} </if> <if test="record.allStatus == 2"> and a.status <![CDATA[< ]]> 4 and a.status <![CDATA[< ]]> 4 and a.comment_state = 1 </if> <if test="record.allStatus == 3"> and a.status <![CDATA[>= ]]> 4 and a.status = 4 and a.comment_state = 2 </if> </where> order by a.created_time desc @@ -243,7 +246,9 @@ <select id="selectTotalAmount" resultType="java.math.BigDecimal"> select IFNULL(sum(IFNULL(amount,0)),0) from mall_order_info where member_id=#{memberId} and status = 4 where member_id=#{memberId} and status = 4 and comment_state = 2 </select> <select id="selectTotalAmountForDate" resultType="java.math.BigDecimal"> @@ -324,6 +329,7 @@ from mall_order_info a where a.status = 4 and a.comment_state = 2 and a.member_id = #{memberId} <if test="createdTime != null"> and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime} @@ -337,6 +343,7 @@ from mall_order_info a where a.status = 4 and a.comment_state = 2 and a.member_id = #{memberId} <if test="createdTime != null"> and date_format(a.CREATED_TIME, '%Y-%m-%d') = #{createdTime} src/main/resources/templates/febs/views/modules/system/systemSetting.html
New file @@ -0,0 +1,106 @@ <div class="layui-fluid layui-anim febs-anim" id="systemSetting" lay-title="系统参数设置"> <div class="layui-row layui-col-space8 febs-container"> <form class="layui-form" action="" lay-filter="systemSetting-form"> <div class="layui-card"> <div class="layui-card-body"> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label ">商品补贴：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="returnPercent" data-th-id="${returnPercent}"--> <!-- lay-verify="number" autocomplete="off" class="layui-input" >--> <!-- </div>--> <!-- <div class="layui-word-aux" style="margin-left: 150px;">【填写整数】:直接输入百分比，例如25%，直接输入25</div>--> <!-- </div>--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label ">每日订单数：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="returnPercent" data-th-id="${returnPercent}"--> <!-- lay-verify="number" autocomplete="off" class="layui-input" >--> <!-- </div>--> <!-- <div class="layui-word-aux" style="margin-left: 150px;">【填写整数】</div>--> <!-- </div>--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label ">直推返利：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="returnPercent" data-th-id="${returnPercent}"--> <!-- lay-verify="number" autocomplete="off" class="layui-input" >--> <!-- </div>--> <!-- <div class="layui-word-aux" style="margin-left: 150px;">【填写整数】:直接输入百分比，例如25%，直接输入25</div>--> <!-- </div>--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label ">第一代分享奖：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="returnPercent" data-th-id="${returnPercent}"--> <!-- lay-verify="number" autocomplete="off" class="layui-input" >--> <!-- </div>--> <!-- <div class="layui-word-aux" style="margin-left: 150px;">【填写整数】:直接输入百分比，例如25%，直接输入25</div>--> <!-- </div>--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label ">第二代分享奖：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="returnPercent" data-th-id="${returnPercent}"--> <!-- lay-verify="number" autocomplete="off" class="layui-input" >--> <!-- </div>--> <!-- <div class="layui-word-aux" style="margin-left: 150px;">【填写整数】:直接输入百分比，例如25%，直接输入25</div>--> <!-- </div>--> <!-- <div class="layui-form-item">--> <!-- <label class="layui-form-label ">保证金返还：</label>--> <!-- <div class="layui-input-block">--> <!-- <input type="text" name="returnPercent" data-th-id="${returnPercent}"--> <!-- lay-verify="number" autocomplete="off" class="layui-input" >--> <!-- </div>--> <!-- <div class="layui-word-aux" style="margin-left: 150px;">【填写整数】:直接输入百分比，例如25%，直接输入25</div>--> <!-- </div>--> </div> <div class="layui-card-footer"> <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="systemSetting-form-submit" id="submit">保存</button> </div> </div> </form> </div> </div> <style> .layui-form-label { width: 120px; } .layui-form-item .layui-input-block { margin-left: 150px; } .layui-table-form .layui-form-item { margin-bottom: 20px !important; } </style> <script data-th-inline="javascript" type="text/javascript"> layui.use(['dropdown', 'jquery', 'validate', 'febs', 'form', 'eleTree'], function () { var $ = layui.jquery, febs = layui.febs, form = layui.form, returnPercent = [[${returnPercent}]], validate = layui.validate, $view = $('#systemSetting'); form.verify(validate); initCashoutValue(); form.render(); function initCashoutValue() { form.val("systemSetting-form", { "returnPercent": returnPercent, }); } form.on('submit(systemSetting-form-submit)', function (data) { console.log(data); febs.post(ctx + 'admin/system/scorePoor', data.field, function (res) { febs.alert.success('设置成功'); }); window.location.reload(); return false; }); }); </script>
