liurunyu
2024-01-16 58253d6b1b23a7ee1d95a0abbe6c5ed5d83a0379
Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

 Conflicts:
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
3个文件已修改
25 ■■■■■ 已修改文件
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/util/Constant.java
@@ -13,6 +13,14 @@
    public static final Integer no = 0 ;
    public static final String YES = "1" ;
    public static final String NO = "0" ;
    // 项目编号
    public static final Integer projectCode_ym = 100;
    public static final Integer projectCode_pj = 101;
    // 协议列表
    public static final String[] protocol = {"DYJS_2023", "DYJS_2024"};
    public static List<String[]> yesNo(){
        List<String[]> list = new ArrayList<>() ;
        list.add(new String[]{YES , "是"}) ;
pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -114,9 +114,9 @@
        idSuffix: 7
#项目编号
projectCode:
    ym: 100
    pj: 101
#projectCode:
#    ym: 100
#    pj: 101
#通讯协议
protocol: DYJS_2023,DYJS_2024
#protocol: DYJS_2023,DYJS_2024
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -7,6 +7,7 @@
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoSe.SeActiveCard;
import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.util.Constant;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrSell.clientCard.CardStateENUM;
import com.dy.pipIrrSell.clientCard.ClientCardSv;
@@ -23,7 +24,6 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -48,8 +48,8 @@
    private final ClientCardSv clientCardSv;
    private final RechargeCtrl rechargeCtrl;
    @Value("${projectCode.ym}")
    private Integer projectCode;
    //@Value("${projectCode.ym}")
    //private Integer projectCode;
    /**
     * 获取开卡记录
@@ -222,7 +222,8 @@
        }
        Map map = new HashMap();
        map.put("projectCode", projectCode);
        //map.put("projectCode", projectCode);
        map.put("projectCode", Constant.projectCode_ym);
        map.put("cardNum", cardNum);
        return BaseResponseUtils.buildSuccess(map) ;
    }