修改问题

qianhe-admin/src/main/java/com/qianhe/system/controller/CCBPayController.java

@@ -55,8 +55,8 @@ public class CCBPayController {
         Double PAYMENT = Double.parseDouble(goods.getTotalPrice());
         Double PAYMENT = Double.parseDouble(goods.getTotalPrice());
         String CURCODE = "01";
         String CURCODE = "01";
         String TXCODE = "530590";
         String TXCODE = "530590";
-        String REMARK1 = "";
-        String REMARK2 = "";
+        String REMARK1 = "minipay";
+        String REMARK2 = "minipay";
         String TYPE = "1";
         String TYPE = "1";
         //公钥后30位
         //公钥后30位
         String PUB = "c2660ff6f7c5d64570352f21020111";
         String PUB = "c2660ff6f7c5d64570352f21020111";

qianhe-admin/src/main/java/com/qianhe/system/domain/WaterGoods.java

@@ -83,4 +83,6 @@ public class WaterGoods
     private BigDecimal sjjg;
     private BigDecimal sjjg;
 
 
     private String speVal;
     private String speVal;
+
+    private String  lbtype;
 }
 }

qianhe-admin/src/main/java/com/qianhe/system/service/impl/WaterSpeServiceImpl.java

@@ -114,7 +114,7 @@ public class WaterSpeServiceImpl implements IWaterSpeService
     {
     {
         //删除商品规格关联的规格规格值
         //删除商品规格关联的规格规格值
         waterSpeMapper.deleteWaterSpeValBySpeId(waterSpeVo.getId());
         waterSpeMapper.deleteWaterSpeValBySpeId(waterSpeVo.getId());
-        waterSpeMapper.deleteWaterGoodsSpeValBySpeId(waterSpeVo.getId());
+//        waterSpeMapper.deleteWaterGoodsSpeValBySpeId(waterSpeVo.getId());
         //新增规格规格值
         //新增规格规格值
         insertWaterSpeVal(waterSpeVo);
         insertWaterSpeVal(waterSpeVo);
         return waterSpeMapper.updateWaterSpe(waterSpeVo);
         return waterSpeMapper.updateWaterSpe(waterSpeVo);

qianhe-admin/src/main/resources/mapper/WaterGoodsMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
 
     <select id="selectWaterGoodsList1"  resultMap="WaterGoodsResult">
     <select id="selectWaterGoodsList1"  resultMap="WaterGoodsResult">
-        select replace(url,'/prod-api','')  cover_img from water_goods_img where del_flag = '0'
+        select replace(url,'/prod-api','')  cover_img,type lbtype from water_goods_img where del_flag = '0'
                                                                              and img_type=3
                                                                              and img_type=3
     </select>
     </select>
 
 

qianhe-admin/src/main/resources/mapper/WaterSpeMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.* from water_spe_val a
         select a.* from water_spe_val a
 
 
         where
         where
-         1=1
+         1=1 and del_flag = '0'
             <if test="speId != null "> and a.spe_id = #{speId}</if>
             <if test="speId != null "> and a.spe_id = #{speId}</if>
 
 
     </select>
     </select>