代码修改

common/common-entity/sql记录

@@ -1661,3 +1661,9 @@ CREATE TABLE `base_ylz_medical_recharge` (
ALTER TABLE base_ylz_medical_recharge add column org_code VARCHAR(255) DEFAULT null ;
ALTER TABLE base_ylz_medical_recharge add column equ_num VARCHAR(255) DEFAULT null ;
ALTER table base_ylz_medical_recharge add column `create_time` datetime DEFAULT NULL COMMENT '创建时间';
 ALTER table base_ylz_medical_recharge add column `org_name` varchar(50) DEFAULT NULL COMMENT '即构名称';
ALTER table base_ylz_medical_recharge add column`amount` varchar(50) DEFAULT NULL COMMENT '充值金额';
 ALTER table base_ylz_medical_recharge add column `charge_result_name` varchar(50) DEFAULT NULL COMMENT '支付结果';
 ALTER table base_ylz_medical_recharge add column `ssc` varchar(50) DEFAULT NULL COMMENT '支付卡号';
 ALTER table base_ylz_medical_recharge add column `deposit_type` varchar(50) DEFAULT NULL COMMENT '支付方式';

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/healthCare/YlzMedicalRecharge.java

@@ -1,9 +1,11 @@
package com.yihu.jw.entity.hospital.healthCare;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Bing on 2022/7/18.
@@ -13,9 +15,15 @@ import javax.persistence.Table;
public class YlzMedicalRecharge extends UuidIdentityEntity {
    private String outChargeNo;
    private String value;
    private String chargeResult;
    private String chargeResult;//init待交易,succ交易成功 (微信/支付宝成功,HIS成功)，fail交易失败 (明确失败)，exp交易异常(微信/支付宝成功,HIS未知,),ing正在交易,closed,交易关闭,notfound交易记录不存在
    private String chargeResultName;
    private String orgCode;
    private String orgName;
    private String equNum;
    private String amount;
    private String ssc;
    private String depositType; //支付方式 支付方式ALI_QR 支付宝二维码支付；WX_QR微信二维码
    private Date createTime;
    public String getOutChargeNo() {
        return outChargeNo;
@@ -41,6 +49,14 @@ public class YlzMedicalRecharge extends UuidIdentityEntity {
        this.chargeResult = chargeResult;
    }
    public String getChargeResultName() {
        return chargeResultName;
    }
    public void setChargeResultName(String chargeResultName) {
        this.chargeResultName = chargeResultName;
    }
    public String getOrgCode() {
        return orgCode;
    }
@@ -57,4 +73,45 @@ public class YlzMedicalRecharge extends UuidIdentityEntity {
        this.equNum = equNum;
    }
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    public String getAmount() {
        return amount;
    }
    public void setAmount(String amount) {
        this.amount = amount;
    }
    public String getSsc() {
        return ssc;
    }
    public void setSsc(String ssc) {
        this.ssc = ssc;
    }
    public String getDepositType() {
        return depositType;
    }
    public void setDepositType(String depositType) {
        this.depositType = depositType;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOrderDrugsEndpoint.java

@@ -207,6 +207,41 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping("/open/getYjjBalance")
    @ApiOperation(value = "获取预交金余额", notes = "预缴金充值结果查询")
    public Envelop getYjjBalance(
            @ApiParam(name="orgCode",value="机构",defaultValue = "")
            @RequestParam(value = "orgCode",required = true) String orgCode,
            @ApiParam(name="ssc",value="社保卡号",defaultValue = "")
            @RequestParam(value = "ssc",required = true) String ssc
    ){
        try {
            return success("操作成功", medOrderService.getYjjBalance(ssc,orgCode));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping("/open/getYjjChargeList")
    @ApiOperation(value = "获取预交金充值记录", notes = "预缴金充值结果查询")
    public Envelop getYjjChargeList(
            @ApiParam(name="ssc",value="社保卡号",defaultValue = "")
            @RequestParam(value = "ssc",required = true) String ssc,
            @ApiParam(name="startTime",value="startTime",required = false)
            @RequestParam(value = "startTime",required = false) String startTime,
            @ApiParam(name="endTime",value="endTime",required = false)
            @RequestParam(value = "endTime",required = false) String endTime
        ){
        try {
            return success("操作成功", medOrderService.getYjjChargeList(ssc,startTime,endTime));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @RequestMapping(value = "/open/hlwyyRechargeNotify", method = RequestMethod.POST)
    @ApiOperation(value = "智能药柜预缴金充值回调数据接收")
    public void hlwyyRechargeNotify(String responsStr) throws Exception {

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedOrderService.java

@@ -1141,4 +1141,51 @@ public class MedOrderService {
        return jwService.executeSickSettleMultiNew(recipe_no);
    }
    /**
     * 获取预交金余额
     * @param cardNo
     * @param orgCode
     * @return
     */
    public String getYjjBalance(String cardNo,String orgCode) throws Exception {
        JSONObject balanceObj = jwService.getSickDispBalance(cardNo,orgCode);
        String balance="";
        if (balanceObj.getString("status").equalsIgnoreCase("200")) {//i健康返回值
            JSONObject responseDataTmp = balanceObj.getJSONObject("data");
            String codeTMP = responseDataTmp.getString("CODE");//智业返回值 0失败 1成功
            if (codeTMP.equalsIgnoreCase("1")) {
                JSONArray byRefParaData = responseDataTmp.getJSONArray("byRefParaData");
                if (byRefParaData.size()>0){
                    balance = byRefParaData.getJSONObject(0).getString("dispBalance");
                    return balance;
                }
            }
        }
        throw new Exception("获取预交金余额失败");
    }
    /**
     * 获取预交金交易记录
     * @param cardNo
     * @return
     * @throws Exception
     */
    public List<Map<String,Object>> getYjjChargeList(String cardNo,String startTime,String endTime) throws Exception {
        List<Map<String,Object>> list = new ArrayList<>();
        String sql = "select *,CAST(DATE_FORMAT(create_time,'%Y-%m-%d %H:%i:%S') as char) create_time from base_ylz_medical_recharge where ssc='"+cardNo+"' and charge_result<>'ing' ";
        if (StringUtils.isNotBlank(startTime)){
            sql +=" and create_time>='"+startTime+" 00:00:00' ";
        }
        if (StringUtils.isNotBlank(endTime)){
            sql +=" and create_time<='"+endTime+" 23:59:59' ";
        }
        sql += " ORDER BY create_time desc ";
        list = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> tmp:list){
            String create_time = tmp.get("create_time").toString();
           tmp.put("create_time",DateUtil.dateToChineseDate(DateUtil.stringToDate(create_time,DateUtil.YYYY_MM_DD_HH_MM_SS)));
        }
        return list;
    }
}