Merge branch 'back' of https://github.com/java110/MicroCommunity into back

java110

2020-05-18 3f4948a093237990407b4deaa77506c720dbb859

Merge branch 'back' of https://github.com/java110/MicroCommunity into back

 StoreService/src/main/java/com/java110/store/listener/smallWeChat/AbstractSmallWeChatBusinessServiceDataFlowListener.java

@@ -46,6 +46,9 @@
        businessSmallWeChatInfo.put("storeId", businessSmallWeChatInfo.get("store_Id"));
        businessSmallWeChatInfo.put("payPassword", businessSmallWeChatInfo.get("pay_password"));
        businessSmallWeChatInfo.put("remarks", businessSmallWeChatInfo.get("remarks"));
        businessSmallWeChatInfo.put("objId", businessSmallWeChatInfo.get("obj_id"));
        businessSmallWeChatInfo.put("objType", businessSmallWeChatInfo.get("obj_type"));
        businessSmallWeChatInfo.put("mchId", businessSmallWeChatInfo.get("mch_id"));
        businessSmallWeChatInfo.remove("bId");
        businessSmallWeChatInfo.put("statusCd", statusCd);
    }
@@ -75,6 +78,9 @@
        currentSmallWeChatInfo.put("storeId", currentSmallWeChatInfo.get("store_Id"));
        currentSmallWeChatInfo.put("payPassword", currentSmallWeChatInfo.get("pay_password"));
        currentSmallWeChatInfo.put("remarks", currentSmallWeChatInfo.get("remarks"));
        currentSmallWeChatInfo.put("objType", currentSmallWeChatInfo.get("obj_type"));
        currentSmallWeChatInfo.put("objId", currentSmallWeChatInfo.get("obj_id"));
        currentSmallWeChatInfo.put("mchId", currentSmallWeChatInfo.get("mch_id"));
        currentSmallWeChatInfo.put("operate", StatusConstant.OPERATE_DEL);
        getSmallWeChatServiceDaoImpl().saveBusinessSmallWeChatInfo(currentSmallWeChatInfo);
    }

 java110-bean/src/main/java/com/java110/dto/smallWeChat/SmallWeChatDto.java

@@ -24,6 +24,10 @@
    private String payPassword;
    private String remarks;
    private String statusCd = "0";
    private String objId;
    private String objType;
    private String mchId;
    private String objTypeName;


    public Date getCreateTime() {
@@ -97,4 +101,36 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String getObjId() {
        return objId;
    }

    public void setObjId(String objId) {
        this.objId = objId;
    }

    public String getObjType() {
        return objType;
    }

    public void setObjType(String objType) {
        this.objType = objType;
    }

    public String getMchId() {
        return mchId;
    }

    public void setMchId(String mchId) {
        this.mchId = mchId;
    }

    public String getObjTypeName() {
        return objTypeName;
    }

    public void setObjTypeName(String objTypeName) {
        this.objTypeName = objTypeName;
    }
}

 java110-bean/src/main/java/com/java110/vo/api/smallWeChat/ApiSmallWeChatDataVo.java

@@ -16,6 +16,10 @@
    private String storeId;
    private String payPassword;
    private String remarks;
    private String objId;
    private String objType;
    private String mchId;
    private String objTypeName;

    public String getOperate() {
        return operate;
@@ -105,5 +109,43 @@
        this.remarks = remarks;
    }

    public String getbId() {
        return bId;
    }

    public void setbId(String bId) {
        this.bId = bId;
    }

    public String getObjId() {
        return objId;
    }

    public void setObjId(String objId) {
        this.objId = objId;
    }

    public String getObjType() {
        return objType;
    }

    public void setObjType(String objType) {
        this.objType = objType;
    }

    public String getMchId() {
        return mchId;
    }

    public void setMchId(String mchId) {
        this.mchId = mchId;
    }

    public String getObjTypeName() {
        return objTypeName;
    }

    public void setObjTypeName(String objTypeName) {
        this.objTypeName = objTypeName;
    }
}

 java110-db/src/main/resources/mapper/store/SmallWeChatServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
    <insert id="saveBusinessSmallWeChatInfo" parameterType="Map">
        insert into
            buiness_small_wechat
            (operate,appId,name,appSecret,weChat_id,b_id,store_Id,pay_password,remarks)
            (operate,appId,name,appSecret,weChat_id,b_id,store_Id,pay_password,remarks,obj_id,obj_type,mch_id)
        values
            (#{operate},#{appId},#{name},#{appSecret},#{weChatId},#{bId},#{storeId},#{payPassword},#{remarks})
            (#{operate},#{appId},#{name},#{appSecret},#{weChatId},#{bId},#{storeId},#{payPassword},#{remarks},#{objId},#{objType},#{mchId})
       </insert>


@@ -26,7 +26,10 @@
            t.b_id,t.b_id bId,
            t.store_Id,t.store_Id storeId,
            t.pay_password,t.pay_password payPassword,
            t.remarks
            t.remarks,
            t.obj_id,t.obj_id objId,
            t.obj_type,t.obj_type objType,
            t.mch_id,t.mch_id mchId
        from
            buiness_small_wechat t
        where 1 =1
@@ -68,10 +71,10 @@
    <insert id="saveSmallWeChatInfoInstance" parameterType="Map">
        insert into
            small_wechat
                (create_time,appId,name,appSecret,status_cd,weChat_id,b_id,store_Id,pay_password,remarks)
                (create_time,appId,name,appSecret,status_cd,weChat_id,b_id,store_Id,pay_password,remarks,obj_id,obj_type,mch_id)
                select
                    t.create_time,t.appId,t.name,t.appSecret,'0',
                    t.weChat_id,t.b_id,t.store_Id,t.pay_password,t.remarks
                    t.weChat_id,t.b_id,t.store_Id,t.pay_password,t.remarks,t.obj_id,t.obj_type,t.mch_id
                from buiness_small_wechat t where 1=1 and t.operate= 'ADD'
        <if test="createTime !=null and createTime != ''">
            and t.create_time= #{createTime}
@@ -116,8 +119,12 @@
            t.b_id,t.b_id bId,
            t.store_Id,t.store_Id storeId,
            t.pay_password,t.pay_password payPassword,
            t.remarks
        from small_wechat t
            t.remarks,
            t.obj_id,t.obj_id objId,
            t.obj_type,t.obj_type objType,
            t.mch_id,t.mch_id mchId,
            d.name objTypeName
        from small_wechat t left join t_dict d on t.obj_type = d.status_cd and d.table_name = 'small_wechat' and d.table_columns = 'obj_type'
        where 1 =1
        <if test="createTime !=null and createTime != ''">
            and t.create_time= #{createTime}
@@ -184,6 +191,15 @@
        <if test="remarks !=null and remarks != ''">
            , t.remarks= #{remarks}
        </if>
        <if test="objId !=null and objId != ''">
            , t.obj_id= #{objId}
        </if>
        <if test="objType !=null and objType != ''">
            , t.obj_type= #{objType}
        </if>
        <if test="mchId !=null and mchId != ''">
            , t.mch_id= #{mchId}
        </if>
        where 1=1
        <if test="weChatId !=null and weChatId != ''">
            and t.weChat_id= #{weChatId}