Merge branch 'medicare' of liubing/wlyy2.0 into medicare

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

@@ -13,9 +13,11 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@RestController
@RequestMapping(value = BaseRequestMapping.BaseOrder.PREFIX)
@@ -27,6 +29,10 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
    MedicineDrugsService medicineDrugsService;
    @Autowired
    private YlzService ylzService;
    @Autowired
    private StringRedisTemplate redisTemplate;
    private static final Long expireTime = 3l;
    @PostMapping(value = "/open/renew")
    @ApiOperation(value = "接收续方订单接口",notes = "接收续方订单接口" )
@@ -95,8 +101,14 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name="equ_num",value="药柜设备号",defaultValue = "")
            @RequestParam(value = "equ_num",required = false) String equ_num){
        try {
            return success("操作成功", medOrderService.getSettlementInfoFirst(recipe_no,card_sn,mdtrt_cert_type,idcard,equ_num));
            synchronized (recipe_no){
                if (redisTemplate.hasKey("getSettlementInfoFirst_"+recipe_no)){
                    return success("操作成功","Repeated submission");
                }else {
                    redisTemplate.opsForValue().set("getSettlementInfoFirst_"+recipe_no,recipe_no,expireTime, TimeUnit.SECONDS);
                    return success("操作成功", medOrderService.getSettlementInfoFirst(recipe_no,card_sn,mdtrt_cert_type,idcard,equ_num));
                }
            }
        } catch (Exception e) {
           e.printStackTrace();
            return Envelop.getError(e.getMessage());
@@ -117,7 +129,15 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name="equ_num",value="药柜设备号",defaultValue = "")
            @RequestParam(value = "equ_num",required = false) String equ_num){
        try {
            return success("操作成功", medOrderService.getSettlementInfoSecond(recipe_no,mdtrt_cert_type,readcardResult,registerResult,equ_num));
            synchronized (recipe_no) {
                if (redisTemplate.hasKey("getSettlementInfoSecode_" + recipe_no)) {
                    return success("操作成功","Repeated submission");
                }else {
                    redisTemplate.opsForValue().set("getSettlementInfoSecode_"+recipe_no,recipe_no,expireTime, TimeUnit.SECONDS);
                    return success("操作成功", medOrderService.getSettlementInfoSecond(recipe_no,mdtrt_cert_type,readcardResult,registerResult,equ_num));
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
@@ -132,8 +152,14 @@ public class MedicineOrderDrugsEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "recipe_no", value = "recipe_no")
            @RequestParam(value = "recipe_no", required = true) String recipe_no){
        try {
            return success("操作成功", medOrderService.getSettlementInfo(chargeArr,recipe_no));
            synchronized (recipe_no) {
                if (redisTemplate.hasKey("getSettlementInfo_" + recipe_no)) {
                    return success("操作成功","Repeated submission");
                }else {
                    redisTemplate.opsForValue().set("getSettlementInfo_"+recipe_no,recipe_no,expireTime, TimeUnit.SECONDS);
                    return success("操作成功", medOrderService.getSettlementInfo(chargeArr,recipe_no));
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());