cloud-server-account/src/main/resources/logback-spring.xml
File was deleted cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -629,10 +629,13 @@ public PointMercharsVo queryPointMerchaseDetailOfId(@RequestBody Integer pointMercharsId){ PointMercharsVo vo = new PointMercharsVo(); PointsMerchandise byId = pmdsService.getById(pointMercharsId); List<UserPointsMerchandise> list = upmseService.list(new LambdaQueryWrapper<UserPointsMerchandise>() .eq(UserPointsMerchandise::getPointsMerchandiseId, pointMercharsId)); if (ToolUtil.isNotEmpty(byId)){ vo.setName(byId.getName()); vo.setCover(byId.getCover()); vo.setPics(byId.getProductImages()); vo.setQuantityHas(list.size()); vo.setQuantityIssued(byId.getQuantityIssued()); vo.setPickUpQuantity(byId.getPickUpQuantity()); vo.setSort(byId.getSort()); @@ -708,4 +711,37 @@ } } @ResponseBody @PostMapping("/base/pointMerchars/updateGoodsDetail") public boolean updateGoodsDetail(@RequestBody Map<String, Object> map){ try { Integer pointMerchandiseId = (Integer) map.get("pointMerchandiseId"); PointsMerchandise byId1 = pmdsService.getById(pointMerchandiseId); Integer quantityIssued = (Integer) map.get("quantityIssued"); Integer pickUpQuantity = (Integer) map.get("pickUpQuantity"); String redemptionInstructions = (String) map.get("redemptionInstructions"); String cover = (String) map.get("cover"); String productImages = (String) map.get("productImages"); Integer sort = (Integer) map.get("sort"); byId1.setQuantityIssued(quantityIssued); byId1.setPickUpQuantity(pickUpQuantity); byId1.setRedemptionInstructions(redemptionInstructions); if (ToolUtil.isNotEmpty(cover)){ byId1.setCover(cover); } if (ToolUtil.isNotEmpty(productImages)){ byId1.setProductImages(productImages); } byId1.setSort(sort); pmdsService.updateById(byId1); return true; }catch (Exception e){ return false; } } } cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java
@@ -24,6 +24,10 @@ */ Integer quantityIssued; /** * 已领数量 */ Integer quantityHas; /** * 限领数量 */ Integer pickUpQuantity; cloud-server-activity/src/main/resources/logback-spring.xml
File was deleted cloud-server-auth/src/main/resources/logback-spring.xml
File was deleted cloud-server-competition/src/main/resources/logback-spring.xml
File was deleted cloud-server-course/src/main/resources/logback-spring.xml
File was deleted cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -30,4 +31,7 @@ @PostMapping("/base/pointMerchars/writeOffGoodsStatus") boolean writeOffGoodsStatus(@RequestBody Map<String, Object> map); @PostMapping("/base/pointMerchars/updateGoodsDetail") boolean updateGoodsDetail(@RequestBody Map<String, Object> stringObjectHashMap); } cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java
@@ -24,6 +24,10 @@ */ Integer quantityIssued; /** * 已领数量 */ Integer quantityHas; /** * 限领数量 */ Integer pickUpQuantity; cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -36,10 +36,7 @@ import javax.annotation.Resource; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; @@ -304,14 +301,31 @@ client.insertIntoData(dataVo); return new SuccessTip<>(); } /** * 编辑 商品详情 * @param pointMerchandiseId 商品Id * @param quantityIssued 发放数量 * @param pickUpQuantity 限领数量 * @param redemptionInstructions 说明 * @param cover 封面图 * @param productImages 商品图片 * @param sort 排序 * @return */ @PostMapping(value = "/update") @ResponseBody public Object update( Integer id,Integer num,Integer num1,String text){ Coupon coupon = client.queryCouponById(id); coupon.setQuantityIssued(num); coupon.setPickUpQuantity(num1); coupon.setIllustrate(text); client.updateCouponData(coupon); public Object update( Integer pointMerchandiseId,Integer quantityIssued,Integer pickUpQuantity,String redemptionInstructions,String cover,String productImages,Integer sort){ Map<String, Object> stringObjectHashMap = new HashMap<>(); stringObjectHashMap.put("pointMerchandiseId",pointMerchandiseId); stringObjectHashMap.put("quantityIssued",quantityIssued); stringObjectHashMap.put("pickUpQuantity",pickUpQuantity); stringObjectHashMap.put("redemptionInstructions",redemptionInstructions); stringObjectHashMap.put("cover",cover); stringObjectHashMap.put("productImages",productImages); stringObjectHashMap.put("sort",sort); System.out.println(stringObjectHashMap); pointMercharsClient.updateGoodsDetail(stringObjectHashMap); return new SuccessTip<>(); } @@ -339,7 +353,7 @@ /** * 跳转到修改车辆管理 * 跳转到修改商品详情 */ @RequestMapping("/tGoods_update/{id}") public String tCityUpdate(@PathVariable Integer id, Model model) { @@ -347,8 +361,11 @@ PointMercharsVo pointMercharsVo = pointMercharsClient.queryPointMerchaseDetailOfId(id); System.out.println("pointMercharsVo:"+pointMercharsVo); String[] split = pointMercharsVo.getPics().split(","); List<String> list = Arrays.asList(split); model.addAttribute("id",id); model.addAttribute("item",pointMercharsVo); model.addAttribute("pictures",split); model.addAttribute("pictures",list); System.out.println(list); return PREFIX + "TGoods_edit.html"; }
@@ -257,6 +257,7 @@ </el-upload> <el-dialog :visible.sync="dialogVisible"> <img width="100%" :src="imageUrl1" alt=""> </el-dialog> </div> </div>
@@ -8,6 +8,7 @@ height: 100px; width: 100px; overflow: hidden; display: inline-block; } .avatar-uploader .el-upload:hover { @@ -42,7 +43,7 @@ <div class="ibox-content"> <div class="form-horizontal" id="carInfoForm"> <div id="b1"> <input id="goodsId" value="${id}" hidden="hidden"> <#input id="name" name="商品名称" type="text" value="${item.name}" readonly="true" /> <#avatar id="cover" name="商品封面:" avatarImg="${item.cover}" /> @@ -52,8 +53,15 @@ <div class="col-sm-6"> <div class="form-group"> <label class="col-sm-3 control-label">商品图片(请上传不超过五张图片): </label> <div class="col-sm-2" style="width: 100%;margin-left: 12%;margin-top: 1%"> <div class="col-sm-2" style="width: 100%;margin-left: 24%;margin-top: 1%"> @for(im in pictures){ <div class="avatar-uploader" style="display: inline-block;"> <img height="100px" width="100px" src="${im}"> <i class="fa fa-close" onclick="delImg(this)" style="color: red;font-size: 18px;position: absolute;"></i> </div> @} <el-upload style="display: inline-block;" :limit="5" class="avatar-uploader" action="/tCouponManage/uploadPic" @@ -63,17 +71,13 @@ :on-remove="handleRemove"> <i class="el-icon-plus"></i> </el-upload> <el-dialog :visible.sync="dialogVisible"> <!-- <img width="100%" :src="imageUrl1" alt="">--> @for(im in pictures){ <img width="100%" src="${im}"> @} </div> </div> </div> </div> <input id="quantityHas" value="${item.quantityHas}" hidden="hidden"> <div class="form-group"> <label class="col-sm-3 control-label">发放数量：</label> <div class="col-sm-9"> @@ -109,8 +113,8 @@ <div class="row btn-group-m-t"> <div class="col-sm-10 col-sm-offset-5"> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TCarInfoDlg.editSubmit()"/> <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TCarInfoDlg.close()"/> <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="TGoodsInfoDlg.editSubmit()"/> <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="TGoodsInfoDlg.close()"/> </div> </div> @@ -132,7 +136,7 @@ }, methods: { handleAvatarSuccess(res, file) { TCarInfoDlg.goodsPicArray.push(file); TGoodsInfoDlg.goodsPicArray.push(file.response); }, beforeAvatarUpload(file) { const isLt2M = file.size / 1024 / 1024 < 10; @@ -142,7 +146,7 @@ return isLt2M; }, handleRemove(file, fileList) { TCarInfoDlg.goodsPicArray = TCarInfoDlg.goodsPicArray.filter(item => { TGoodsInfoDlg.goodsPicArray = TGoodsInfoDlg.goodsPicArray.filter(item => { return item.uid != file.uid; }); }, cloud-server-management/src/main/webapp/static/modular/system/tCoupon/TCouponInfo.js
@@ -432,6 +432,8 @@ } } cts = cityIds.join(','); }else { cts = cityIds; } }
@@ -2,8 +2,8 @@ * 初始化车辆管理详情对话框 */ var language=1; var TCarInfoDlg = { tCarInfoData : {}, var TGoodsInfoDlg = { tGoodsInfoData : {}, validateFields: { }, goodsPicArray:[], @@ -14,7 +14,7 @@ /** * 验证数据是否为空 */ TCarInfoDlg.validate = function () { TGoodsInfoDlg.validate = function () { $('#carInfoForm').data("bootstrapValidator").resetForm(); $('#carInfoForm').bootstrapValidator('validate'); return $("#carInfoForm").data('bootstrapValidator').isValid(); @@ -23,8 +23,8 @@ /** * 清除数据 */ TCarInfoDlg.clearData = function() { this.tCarInfoData = {}; TGoodsInfoDlg.clearData = function() { this.tGoodsInfoData = {}; } /** @@ -33,8 +33,8 @@ * @param key 数据的名称 * @param val 数据的具体值 */ TCarInfoDlg.set = function(key, val) { this.tCarInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val; TGoodsInfoDlg.set = function(key, val) { this.tGoodsInfoData[key] = (typeof val == "undefined") ? $("#" + key).val() : val; return this; } @@ -44,14 +44,14 @@ * @param key 数据的名称 * @param val 数据的具体值 */ TCarInfoDlg.get = function(key) { TGoodsInfoDlg.get = function(key) { return $("#" + key).val(); } /** * 关闭此对话框 */ TCarInfoDlg.close = function() { TGoodsInfoDlg.close = function() { parent.layer.close(window.parent.TPointProducts.layerIndex); } @@ -59,7 +59,7 @@ /** * 收集数据 */ TCarInfoDlg.collectData = function() { TGoodsInfoDlg.collectData = function() { this .set('id') .set('isPlatCar') @@ -114,7 +114,7 @@ }); this.layerIndex = index; } TCarInfoDlg.selecUserOpt = function (arrays){ TGoodsInfoDlg.selecUserOpt = function (arrays){ console.log(arrays) //获取所有的值 var subArr= this.storeIds; @@ -145,15 +145,15 @@ console.log(e); var row = $(e).closest('tr'); var value = row.find('#id').val(); TCarInfoDlg.storeIds.splice(TCarInfoDlg.storeIds.indexOf(parseInt(value)), 1) TGoodsInfoDlg.storeIds.splice(TGoodsInfoDlg.storeIds.indexOf(parseInt(value)), 1) $(e).parent().parent().remove(); console.log('storeIds',TCarInfoDlg.storeIds) console.log('storeIds',TGoodsInfoDlg.storeIds) } TCarInfoDlg.delete = function (o) { TGoodsInfoDlg.delete = function (o) { $(o).parent("div").remove() } var num = 0; TCarInfoDlg.addBranch = function () { TGoodsInfoDlg.addBranch = function () { num=num+1; var a= ""; a = "<div style=\'margin-left: 25%\' class=\"col-sm-9 control-label\">\n" + @@ -165,7 +165,7 @@ " <option value=\"\">请选择</option>\n" + " </select>\n" + " <label class=\"col-sm-1\" style=\"width: 7%;margin-top: 7px\">市</label>\n" + " <label name=\"addBranch\" class=\"col-sm-1\" onclick=\"TCarInfoDlg.delete(this)\" style=\"border: 0px;cursor: pointer;margin-top: 1%\"><i class=\"fa fa-trash\"></i></label>"+ " <label name=\"addBranch\" class=\"col-sm-1\" onclick=\"TGoodsInfoDlg.delete(this)\" style=\"border: 0px;cursor: pointer;margin-top: 1%\"><i class=\"fa fa-trash\"></i></label>"+ " </div>"; $("#cityDemo").append($(a)); getProvince(num); @@ -229,7 +229,7 @@ /** * 提交添加 */ TCarInfoDlg.addSubmit = function() { TGoodsInfoDlg.addSubmit = function() { this.clearData(); this.collectData(); @@ -273,7 +273,7 @@ Feng.success("Sangat berhasil ditambah!"); } window.parent.TCompetition.table.refresh(); TCarInfoDlg.close(); TGoodsInfoDlg.close(); }else{ Feng.error(data.msg); } @@ -281,7 +281,7 @@ },function(data){ Feng.error("添加失败!" + data.responseJSON.message + "!"); }); ajax.set(this.tCarInfoData); ajax.set(this.tGoodsInfoData); ajax.set("provinceCode",pCode); ajax.set("cityCode",cCode); ajax.set("name",name); @@ -290,68 +290,71 @@ } /** * 删除图片的函数 * @param e */ function delImg(e){ $(e).parent().remove(); } /** * 提交修改 */ TCarInfoDlg.editSubmit = function() { TGoodsInfoDlg.editSubmit = function() { let cover = $("#cover").val(); let goodsId = $("#goodsId").val(); var productImages = ""; if (TGoodsInfoDlg.goodsPicArray.length > 0){ productImages = TGoodsInfoDlg.goodsPicArray.join(','); } let quantityIssued = $("#quantityIssued").val(); let pickUpQuantity = $("#pickUpQuantity").val(); let editor = jQuery.trim(TGoodsInfoDlg.editor.getContent()); console.log('editor:',editor) this.clearData(); this.collectData(); if(!this.validate()){ return ; } let pCode = $("#pCode").val() let cCode = $("#cCode").val() let name = $("#name").val() let phone = $("#phone").val() let sort = $("#sort").val(); if(pCode==''){ Feng.info("请选择省") return; if (quantityIssued === undefined || quantityIssued === null || quantityIssued === ''){ return Feng.error('发放数量不能为空！'); } if(cCode==''){ Feng.info("请选择市") return; if (pickUpQuantity === undefined || pickUpQuantity === null || pickUpQuantity === ''){ return Feng.error('限领数量不能为空！'); } if(name==''){ Feng.info("管理员姓名不能为空") return; let quantityHas = $("#quantityHas").val(); if (quantityIssued <= quantityHas){ return Feng.error('发放数量小于已领数量!'); } if(phone==''){ Feng.info("管理员手机号不能为空") return; if (editor === undefined || editor === null || editor === ''){ return Feng.error('兑换说明不能为空！'); } if (sort === undefined || sort === null || sort === ''){ return Feng.error('排序不能为空！'); } //提交信息 var ajax = new $ax(Feng.ctxPath + "/tCity/update", function(data){ if(data=="5001"){ Feng.error("改账号已经存在"); }else if(data.code == 200){ if(language==1){ Feng.success("修改成功!"); }else if(language==2){ Feng.success("Modify successfully!"); }else { Feng.success("Mengubah dengan sukses!"); } window.parent.TCompetition.table.refresh(); TCarInfoDlg.close(); }else{ Feng.error(data.msg); } var ajax = new $ax(Feng.ctxPath + "/tGoods/update", function(data){ Feng.success("修改成功!"); window.parent.TPointProducts.table.refresh(); TGoodsInfoDlg.close(); },function(data){ Feng.error("修改失败!" + data.responseJSON.message + "!"); }); ajax.set("provinceCode",pCode); ajax.set("cityCode",cCode); ajax.set("name",name); ajax.set("phone",phone); ajax.set("id",$("#id").val()); ajax.set("pointMerchandiseId",goodsId); ajax.set("quantityIssued",quantityIssued); ajax.set("pickUpQuantity",pickUpQuantity); ajax.set("redemptionInstructions",editor); ajax.set("cover",cover); ajax.set("productImages",productImages); ajax.set("sort",sort); ajax.start(); } $(function() { getProvince(null); Feng.initValidator("carInfoForm", TCarInfoDlg.validateFields); Feng.initValidator("carInfoForm", TGoodsInfoDlg.validateFields); // 初始化图片上传 var carPhoto = new $WebUpload("cover"); carPhoto.setUploadBarId("progressBar"); @@ -359,13 +362,13 @@ var drivingLicensePhoto = new $WebUpload("drivingLicensePhoto"); drivingLicensePhoto.setUploadBarId("progressBar"); drivingLicensePhoto.init(); TCarInfoDlg.editor = UE.getEditor('editor'); TGoodsInfoDlg.editor = UE.getEditor('editor'); }); /** * 选择分公司后执行 */ TCarInfoDlg.oneChange = function (e) { TGoodsInfoDlg.oneChange = function (e) { var oneId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCity/onChange", function(data){ if(data!=null){ @@ -390,7 +393,7 @@ * 类型改变执行 * @param e */ TCarInfoDlg.companyTypeClick = function (e) { TGoodsInfoDlg.companyTypeClick = function (e) { if (1 == e){ $(".companyDiv").hide(); } else if (2 == e){ @@ -401,7 +404,7 @@ /** * 车辆品牌改变时执行 */ TCarInfoDlg.brandChange = function (e) { TGoodsInfoDlg.brandChange = function (e) { var carBrandId=$(e).val(); var ajax = new $ax(Feng.ctxPath + "/tCar/brandChange", function(data){ if(data!=null){ @@ -426,7 +429,7 @@ /** * 专车服务被点击 */ TCarInfoDlg.zcServerClick = function () { TGoodsInfoDlg.zcServerClick = function () { var serverBox1 = $('#serverBox1').prop('checked'); if (serverBox1){ $("#zcModelDiv").show(); @@ -438,7 +441,7 @@ /** * 跨城服务被点击 */ TCarInfoDlg.kcServerClick = function () { TGoodsInfoDlg.kcServerClick = function () { var serverBox3 = $('#serverBox3').prop('checked'); if (serverBox3){ $("#kcModelDiv").show(); cloud-server-other/src/main/resources/logback-spring.xml
File was deleted
