合并代码

Pu Zhibing

2024-09-24 a736a3d09dd52bb81fa922861fc8938c8eb26550

合并代码

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -1774,11 +1774,15 @@
    @PostMapping("/base/pointMerchars/updateGoodsDetail")
    public boolean updateGoodsDetail(@RequestBody Map<String, Object> map) {
        try {
            String name = (String) map.get("name");
            Integer pointMerchandiseId = (Integer) map.get("pointMerchandiseId");
            PointsMerchandise byId1 = pmdsService.getById(pointMerchandiseId);
            if (Integer.valueOf(map.get("type").toString()) != 1) {
                byId1.setStatus(2);
            }
            if(StringUtils.hasLength(name)){
                byId1.setName(name);
            }
            Integer quantityIssued = (Integer) map.get("quantityIssued");
            Integer pickUpQuantity = (Integer) map.get("pickUpQuantity");
            String redemptionInstructions = (String) map.get("redemptionInstructions");

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupCompetitorServiceImpl.java

@@ -576,7 +576,7 @@
                .eq("participantType", participantType).eq("participantId", participantId)
                .isNotNull("matchResult").orderByDesc("startTime"));
        List<Map<String, Object>> mapList = new ArrayList<>();
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy.HH.dd HH:mm");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");
        for (WorldCupCompetitor cupCompetitor : list) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", cupCompetitor.getId().toString());

 cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml

@@ -210,7 +210,7 @@
        aa.appUserId,
        aa.totalSession,
        aa.win,
        aa.winRate
        ROUND(aa.winRate, 2) as winRate
        from (
            select
            a.participantType,

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java

@@ -416,8 +416,10 @@
     */
    @PostMapping(value = "/update")
    @ResponseBody
    public Object update( Integer pointMerchandiseId,Integer quantityIssued,Integer pickUpQuantity,String redemptionInstructions,String cover,String productImages,Integer sort){
    public Object update(String name, Integer pointMerchandiseId,Integer quantityIssued,Integer pickUpQuantity,
                          String redemptionInstructions,String cover,String productImages,Integer sort){
        Map<String, Object> stringObjectHashMap = new HashMap<>();
        stringObjectHashMap.put("name",name);
        stringObjectHashMap.put("pointMerchandiseId",pointMerchandiseId);
        stringObjectHashMap.put("quantityIssued",quantityIssued);
        stringObjectHashMap.put("pickUpQuantity",pickUpQuantity);

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java

@@ -272,11 +272,13 @@
            response.setContentType("APPLICATION/OCTET-STREAM");
            response.setHeader("Content-Disposition","attachment; filename=" + URLEncoder.encode("二维码", "UTF-8") + ".zip");
            ZipOutputStream out = new ZipOutputStream(response.getOutputStream());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
            for(Map<String, Object> map : list){
                String id = map.get("id").toString();
                String isStudent = map.get("isStudent").toString();
                String name = map.get("name").toString();
                QRCodeUtils.encode("{\"id\":" + id + ",\"isStudent\":" + isStudent + "}", name, "/usr/playpai/qrcode", false);
                String name = map.get("name").toString() + sdf.format(new Date());
                String content = "{\"id\":" + id + ",\"isStudent\":" + isStudent + "}";
                QRCodeUtils.encode(content, name, "/usr/playpai/qrcode", false);
                File file = new File("/usr/playpai/qrcode/" + name + ".jpg");
                FileInputStream fileInputStream = new FileInputStream(file);


 cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoods/TGoods_edit.html

@@ -45,7 +45,7 @@
            <div id="b1">
                <input id="goodsId" value="${id}" hidden="hidden">
                <input id="nums" value="${item.num}" hidden="hidden">
                <#input id="name" name="商品名称" type="text" value="${item.name}" readonly="true" />
                <#input id="name" name="商品名称" type="text" value="${item.name}" />

                <#avatar id="cover" name="商品封面:" avatarImg="${item.cover}" />


 cloud-server-management/src/main/webapp/WEB-INF/view/system/tGoodsAudit/TGoods_edit.html

@@ -44,7 +44,7 @@
        <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" />
                <#input id="name" name="商品名称" type="text" value="${item.name}" />

                <#avatar id="cover" name="商品封面:" avatarImg="${item.cover}" />


 cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods_info.js

@@ -978,6 +978,7 @@
    }
    console.log("结果图片")
    console.log(imgOne)
    let name = $("#name").val();
    let quantityIssued = $("#quantityIssued").val();
    let pickUpQuantity = $("#pickUpQuantity").val();
    let editor = jQuery.trim(TGoodsInfoDlg.editor.getContent());
@@ -1011,6 +1012,7 @@
    },function(data){
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("name",name);
    ajax.set("pointMerchandiseId",goodsId);
    ajax.set("quantityIssued",quantityIssued);
    ajax.set("pickUpQuantity",pickUpQuantity);

 cloud-server-management/src/main/webapp/static/modular/system/tGoodsAudit/tGoods_info.js

@@ -598,6 +598,7 @@
    if (TGoodsInfoDlg.goodsPicArray.length > 0){
        productImages = TGoodsInfoDlg.goodsPicArray.join(',');
    }
    let name = $("#name").val();
    let quantityIssued = $("#quantityIssued").val();
    let pickUpQuantity = $("#pickUpQuantity").val();
    let editor = jQuery.trim(TGoodsInfoDlg.editor.getContent());
@@ -632,6 +633,7 @@
    },function(data){
        Feng.error("修改失败!" + data.responseJSON.message + "!");
    });
    ajax.set("name",name);
    ajax.set("pointMerchandiseId",goodsId);
    ajax.set("quantityIssued",quantityIssued);
    ajax.set("pickUpQuantity",pickUpQuantity);