代码修改

common/common-entity/sql记录

@@ -1651,3 +1651,10 @@ CREATE TABLE `base_ylz_medical_response` (
  `value` longtext COMMENT '医保结算返回值',
  PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COMMENT='医保确认结算返回值';
CREATE TABLE `base_ylz_medical_recharge` (
  `id` varchar(50) NOT NULL,
  `out_charge_no` varchar(50) DEFAULT NULL COMMENT '流水号',
  `value` varchar(2000) DEFAULT NULL COMMENT '关联处方号',
  `charge_result` varchar(50) DEFAULT NULL COMMENT '预交金交易结果',
  PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COMMENT='医保预交金充值关联表';

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

@@ -142,6 +142,50 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping("/open/patient/hlwyyRecharge")
    @ApiOperation(value = "居民自助充值-预缴金", notes = "预缴金充值")
    public Envelop patientHlwyyRecharge(
            @ApiParam(name="orgCode",value="机构code",defaultValue = "")
            @RequestParam(value = "orgCode",required = false) String orgCode,
            @ApiParam(name="equ_num",value="药柜设备号",defaultValue = "")
            @RequestParam(value = "equ_num",required = false) String equ_num,
            @ApiParam(name="ssc",value="社保卡",defaultValue = "")
            @RequestParam(value = "ssc",required = false) String ssc,
            @ApiParam(name="depositType",value="支付方式ALI_QR 支付宝二维码支付；WX_QR微信二维码",defaultValue = "")
            @RequestParam(value = "depositType",required = false) String depositType,
            @ApiParam(name="amount",value="金额 单位元 2位小数",defaultValue = "")
            @RequestParam(value = "amount",required = false) String amount,
            @ApiParam(name="hisCustId",value="患者his系统编号 可传身份证",defaultValue = "")
            @RequestParam(value = "hisCustId",required = false) String hisCustId,
            @ApiParam(name="userName",value="患者名字",defaultValue = "")
            @RequestParam(value = "userName",required = false) String userName,
            @ApiParam(name="returnUrl",value="支付成功后中转地址",defaultValue = "")
            @RequestParam(value = "returnUrl",required = false) String returnUrl
    ){
        try {
            return success("操作成功", medOrderService.patientHlwyyRecharge(orgCode,equ_num,ssc,
                    depositType,amount,hisCustId,userName,returnUrl));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping("/open/patient/hlwyyRechargeTest")
    @ApiOperation(value = "居民自助充值-预缴金", notes = "预缴金充值")
    public Envelop patientHlwyyRecharge(
    ){
        try {
            return success("操作成功", medOrderService.patientHlwyyRecharge("3502060300","14912202107000001500000000000000","DD2781527",
                    "WX_QR","10.5","350524199405230613","王志南",null));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
    @GetMapping("/open/hlwyyQueryDetail")
    @ApiOperation(value = "预缴金充值结果查询", notes = "预缴金充值结果查询")
    public Envelop hlwyyQueryDetail(

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

@@ -32,6 +32,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -1087,6 +1089,33 @@ public class MedOrderService {
    }
    /**
     * 居民自主充值-预交金
     * @param orgCode
     * @param equ_num
     * @param ssc
     * @param depositType
     * @param amount
     * @param hisCustId
     * @param userName
     * @param returnUrl
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public String patientHlwyyRecharge(String orgCode,String equ_num,String ssc,String depositType,String amount,
                                       String hisCustId,String userName,String returnUrl) throws Exception {
         String reg_money = "\\d+(\\.\\d{1,2})?";//传入金额格式验证 0.00
         Pattern pattern = Pattern.compile(reg_money);
         Matcher matcher = pattern.matcher(amount);
         if (!matcher.matches()){
             throw new Exception("充值金额格式传入错误");
         }
        return ylzService.hlwyyRecharge(orgCode,equ_num,ssc,
                depositType,amount,hisCustId,userName,returnUrl,null);
    }
    /**
     * 确认结算-智业
     * @param