java/haizhentong.git

parent: 2fea785f | 补丁 | 提交 | ignore whitespace

Merge remote-tracking branch 'origin/master'

无关风月

2026-01-14 2526190b209e74f3f882eaf19cc95d333589d7b8

Merge remote-tracking branch 'origin/master'

6个文件已修改

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-common/src/main/java/com/ruoyi/common/constant/WxConstant.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/vo/ShopCarVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java

@@ -481,7 +481,7 @@
        if (dto.getState() == 1 && goods.getClinicPurchasePrice() == null) {
            return R.fail("操作失败，请设置供应商分佣比例后再启用");
        }
        if (dto.getState() == 1 && goods.getStateUser() == 1 && user.getRoleType() == 4) {
        if (dto.getState() == 1 && Objects.nonNull(goods.getStateUser()) && goods.getStateUser() == 1 && user.getRoleType() == 4) {
            return R.fail("操作失败，平台禁用商品不可启用");
        }
        if (user.getRoleType() == 1) {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsShopController.java

@@ -184,21 +184,21 @@
        if (goodsIds.isEmpty()){
            ShopCarVO shopCarVO = new ShopCarVO();
            shopCarVO.setTotalPrice(BigDecimal.ZERO);
            shopCarVO.setList(new PageInfo<>());
            shopCarVO.setList(new ArrayList<>());
            return R.ok(shopCarVO);
        }
        TErpGoodsShopQuery tErpGoodsShopQuery = new TErpGoodsShopQuery();
        tErpGoodsShopQuery.setGoodsIds(goodsIds);
        PageInfo<TErpGoodsVO> tErpGoodsVOPageInfo = erpGoodsService.pageShopList(tErpGoodsShopQuery);
        List<TErpGoodsVO> records = tErpGoodsVOPageInfo.getRecords();
        for (TErpGoodsVO record : records) {
            for (ShoppingCartItem cartItem : cacheList) {
                if (cartItem.getId().equals(record.getId())) {
                    record.setNumber(cartItem.getNum());
                    record.setPrice(record.getSalesAmount().multiply(new BigDecimal(record.getNumber())).setScale(2, RoundingMode.HALF_UP));
                }
            }
        }
//        PageInfo<TErpGoodsVO> tErpGoodsVOPageInfo = erpGoodsService.pageShopList(tErpGoodsShopQuery);
//        List<TErpGoodsVO> records = tErpGoodsVOPageInfo.getRecords();
//        for (TErpGoodsVO record : records) {
//            for (ShoppingCartItem cartItem : cacheList) {
//                if (cartItem.getId().equals(record.getId())) {
//                    record.setNumber(cartItem.getNum());
//                    record.setPrice(record.getSalesAmount().multiply(new BigDecimal(record.getNumber())).setScale(2, RoundingMode.HALF_UP));
//                }
//            }
//        }
        List<TErpGoodsVO> listAll = erpGoodsService.pageShopListAll(tErpGoodsShopQuery);
        for (TErpGoodsVO record : listAll) {
            for (ShoppingCartItem cartItem : cacheList) {
@@ -208,8 +208,8 @@
                }
            }
        }
        BigDecimal totalPrice = records.stream().map(TErpGoodsVO::getPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
        res.setList(tErpGoodsVOPageInfo);
        BigDecimal totalPrice = listAll.stream().map(TErpGoodsVO::getPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
        res.setList(listAll);
        res.setTotalPrice(totalPrice);
        return R.ok(res);
    }

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TSysAppUserController.java

@@ -216,9 +216,10 @@
            String url = WxConstant.CREATE_CODE_URL.replace("ACCESS_TOKEN", accessToken);
            // 发送请求
            try {
                HashMap<String, String> map = new HashMap<>();
                map.put("path", "pages/invite/invite");
                HashMap<String, Object> map = new HashMap<>();
                map.put("page", "pages/invite/invite");
                map.put("scene", "clinicId=" + crmClinic.getId());
                map.put("check_path", false);
                HttpHeaders headers = new HttpHeaders();
                headers.setContentType(MediaType.APPLICATION_JSON);
                HttpEntity requestEntity = new HttpEntity(map, headers);

 ruoyi-common/src/main/java/com/ruoyi/common/constant/WxConstant.java

@@ -10,7 +10,7 @@
    /**
     * 生成小程序码地址
     */
    public static final String CREATE_CODE_URL = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN";
    public static final String CREATE_CODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN";

    /**
     * 高德地图坐标转换

 ruoyi-system/src/main/java/com/ruoyi/system/vo/ShopCarVO.java

@@ -6,6 +6,7 @@
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
@ApiModel("购物车返回VO")
@@ -14,5 +15,5 @@
    private BigDecimal totalPrice;

    @ApiModelProperty("购物车")
    private PageInfo<TErpGoodsVO> list;
    private List<TErpGoodsVO> list;
}

 ruoyi-system/src/main/resources/mapper/system/TErpGoodsMapper.xml

@@ -444,8 +444,9 @@

    </select>
    <select id="pageShopList" resultType="com.ruoyi.system.vo.TErpGoodsVO">
        select t1.id,t1.cover,t1.low_purchase_quantity,t1.packing_unit_id,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier
        ,t3.unit_name as packingUnitName
        select t1.id,t1.cover,t1.goods_name,t1.low_purchase_quantity,t1.low_unit_id,t1.packing_unit_id,
               t1.manufacturer,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier,
                t3.unit_name as packingUnitName
        from t_erp_goods t1
        left join t_crm_supplier t2 on t1.supplier_clinic_id = t2.id
        left join t_erp_goods_unit t3 on t1.packing_unit_id = t3.id
@@ -476,8 +477,9 @@

    </select>
    <select id="pageShopListAll" resultType="com.ruoyi.system.vo.TErpGoodsVO">
        select t1.id,t1.cover,t1.low_purchase_quantity,t1.packing_unit_id,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier
        ,t3.unit_name as packingUnitName
        select t1.id,t1.cover,t1.goods_name,t1.low_purchase_quantity,t1.low_unit_id,t1.packing_unit_id,
        t1.manufacturer,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier,
        t3.unit_name as packingUnitName
        from t_erp_goods t1
        left join t_crm_supplier t2 on t1.supplier_clinic_id = t2.id
        left join t_erp_goods_unit t3 on t1.packing_unit_id = t3.id

			@@ -481,7 +481,7 @@
			if (dto.getState() == 1 && goods.getClinicPurchasePrice() == null) {
			return R.fail("操作失败，请设置供应商分佣比例后再启用");
			}
			if (dto.getState() == 1 && goods.getStateUser() == 1 && user.getRoleType() == 4) {
			if (dto.getState() == 1 && Objects.nonNull(goods.getStateUser()) && goods.getStateUser() == 1 && user.getRoleType() == 4) {
			return R.fail("操作失败，平台禁用商品不可启用");
			}
			if (user.getRoleType() == 1) {

			@@ -184,21 +184,21 @@
			if (goodsIds.isEmpty()){
			ShopCarVO shopCarVO = new ShopCarVO();
			shopCarVO.setTotalPrice(BigDecimal.ZERO);
			shopCarVO.setList(new PageInfo<>());
			shopCarVO.setList(new ArrayList<>());
			return R.ok(shopCarVO);
			}
			TErpGoodsShopQuery tErpGoodsShopQuery = new TErpGoodsShopQuery();
			tErpGoodsShopQuery.setGoodsIds(goodsIds);
			PageInfo<TErpGoodsVO> tErpGoodsVOPageInfo = erpGoodsService.pageShopList(tErpGoodsShopQuery);
			List<TErpGoodsVO> records = tErpGoodsVOPageInfo.getRecords();
			for (TErpGoodsVO record : records) {
			for (ShoppingCartItem cartItem : cacheList) {
			if (cartItem.getId().equals(record.getId())) {
			record.setNumber(cartItem.getNum());
			record.setPrice(record.getSalesAmount().multiply(new BigDecimal(record.getNumber())).setScale(2, RoundingMode.HALF_UP));
			}
			}
			}
			// PageInfo<TErpGoodsVO> tErpGoodsVOPageInfo = erpGoodsService.pageShopList(tErpGoodsShopQuery);
			// List<TErpGoodsVO> records = tErpGoodsVOPageInfo.getRecords();
			// for (TErpGoodsVO record : records) {
			// for (ShoppingCartItem cartItem : cacheList) {
			// if (cartItem.getId().equals(record.getId())) {
			// record.setNumber(cartItem.getNum());
			// record.setPrice(record.getSalesAmount().multiply(new BigDecimal(record.getNumber())).setScale(2, RoundingMode.HALF_UP));
			// }
			// }
			// }
			List<TErpGoodsVO> listAll = erpGoodsService.pageShopListAll(tErpGoodsShopQuery);
			for (TErpGoodsVO record : listAll) {
			for (ShoppingCartItem cartItem : cacheList) {
			@@ -208,8 +208,8 @@
			}
			}
			}
			BigDecimal totalPrice = records.stream().map(TErpGoodsVO::getPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
			res.setList(tErpGoodsVOPageInfo);
			BigDecimal totalPrice = listAll.stream().map(TErpGoodsVO::getPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
			res.setList(listAll);
			res.setTotalPrice(totalPrice);
			return R.ok(res);
			}

			@@ -216,9 +216,10 @@
			String url = WxConstant.CREATE_CODE_URL.replace("ACCESS_TOKEN", accessToken);
			// 发送请求
			try {
			HashMap<String, String> map = new HashMap<>();
			map.put("path", "pages/invite/invite");
			HashMap<String, Object> map = new HashMap<>();
			map.put("page", "pages/invite/invite");
			map.put("scene", "clinicId=" + crmClinic.getId());
			map.put("check_path", false);
			HttpHeaders headers = new HttpHeaders();
			headers.setContentType(MediaType.APPLICATION_JSON);
			HttpEntity requestEntity = new HttpEntity(map, headers);

			@@ -10,7 +10,7 @@
			/**
			* 生成小程序码地址
			*/
			public static final String CREATE_CODE_URL = "https://api.weixin.qq.com/cgi-bin/wxaapp/createwxaqrcode?access_token=ACCESS_TOKEN";
			public static final String CREATE_CODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=ACCESS_TOKEN";

			/**
			* 高德地图坐标转换

			@@ -6,6 +6,7 @@
			import lombok.Data;

			import java.math.BigDecimal;
			import java.util.List;

			@Data
			@ApiModel("购物车返回VO")
			@@ -14,5 +15,5 @@
			private BigDecimal totalPrice;

			@ApiModelProperty("购物车")
			private PageInfo<TErpGoodsVO> list;
			private List<TErpGoodsVO> list;
			}

			@@ -444,8 +444,9 @@

			</select>
			<select id="pageShopList" resultType="com.ruoyi.system.vo.TErpGoodsVO">
			select t1.id,t1.cover,t1.low_purchase_quantity,t1.packing_unit_id,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier
			,t3.unit_name as packingUnitName
			select t1.id,t1.cover,t1.goods_name,t1.low_purchase_quantity,t1.low_unit_id,t1.packing_unit_id,
			t1.manufacturer,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier,
			t3.unit_name as packingUnitName
			from t_erp_goods t1
			left join t_crm_supplier t2 on t1.supplier_clinic_id = t2.id
			left join t_erp_goods_unit t3 on t1.packing_unit_id = t3.id
			@@ -476,8 +477,9 @@

			</select>
			<select id="pageShopListAll" resultType="com.ruoyi.system.vo.TErpGoodsVO">
			select t1.id,t1.cover,t1.low_purchase_quantity,t1.packing_unit_id,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier
			,t3.unit_name as packingUnitName
			select t1.id,t1.cover,t1.goods_name,t1.low_purchase_quantity,t1.low_unit_id,t1.packing_unit_id,
			t1.manufacturer,t1.sales_amount,t1.supplier_clinic_id,t2.supplier_name as supplier,
			t3.unit_name as packingUnitName
			from t_erp_goods t1
			left join t_crm_supplier t2 on t1.supplier_clinic_id = t2.id
			left join t_erp_goods_unit t3 on t1.packing_unit_id = t3.id