Merge branch 'ijkdev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	app/app-iot-server/pom.xml
#	app/app-iot-server/src/main/java/com/yihu/ehr/iot/AppIotServer.java
#	app/app-iot-server/src/main/java/com/yihu/iot/controller/common/LoginController.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/config/EhrWebHttpSessionConfiguration.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/config/EhrWebSecurityConfiguration.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAccessDecisionManager.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAuthenticationFailureHandler.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebAuthenticationToken.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUserDetails.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUserDetailsService.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/core/EhrWebUsernamePasswordAuthenticationFilter.java
#	app/app-iot-server/src/main/java/com/yihu/iot/security/entryPoint/LoginEntryPoint.java
#	app/app-iot-server/src/main/resources/application.yml
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationProvider.java
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationSuccessHandler.java
#	app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebContextLogoutHandler.java
#	app/public-health-server/src/main/java/com/yihu/health/util/CurrentRequest.java
#	svr/svr-base/src/main/resources/application.yml
#	web-gateway/src/main/java/com/yihu/jw/controller/base/login/LoginContorller.java
#	web-gateway/src/main/resources/application.yml

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/CreditsDetailDO.java

@@ -332,6 +332,7 @@ public class CreditsDetailDO extends UuidIdentityEntityWithOperator implements S
        this.exchangeGoodsDO = exchangeGoodsDO;
    }
    @Transient
    public String getUploadTime() {
        return uploadTime;
    }

common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/bank/HealthBankMapping.java

@@ -74,5 +74,6 @@ public class HealthBankMapping {
        public static final String selectTaskAndPatients = "/selectTaskAndPatients";
        public static final String shareIntegrate = "/shareIntegrate";
        public static final String payIntegrate = "/payIntegrate";
        public static final String refund="/refund";
    }
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/CreditsDetailController.java

@@ -379,4 +379,24 @@ public class CreditsDetailController extends EnvelopRestEndpoint {
    }
    /**
     * 商城退款
     * @param orders
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.refund)
    @ApiOperation(value = "商城退款")
    public MixEnvelop<CreditsDetailDO, CreditsDetailDO> refund(@ApiParam(name = "orders",value = "订单集合")
                                                                     @RequestParam(value = "orders",required = false)String orders){
        try {
            JSONArray array = JSONArray.parseArray(orders);
            return service.refundIntegrate(array);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/CredittsLogDetailDao.java

@@ -1,11 +1,15 @@
package com.yihu.jw.dao;
import com.yihu.jw.entity.health.bank.AccountDO;
import com.yihu.jw.entity.health.bank.CreditsDetailDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by wang zhinan on 2018/4/27.
 */
public interface CredittsLogDetailDao extends PagingAndSortingRepository<CreditsDetailDO,String>,JpaSpecificationExecutor<CreditsDetailDO>{
    @Query("select t from CreditsDetailDO t where t.transactionId=?1 and t.tradeType=?2 and t.status=1")
    CreditsDetailDO selectByTransactionId(String transactionId,String tradeType);
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java

@@ -1395,4 +1395,34 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
    }
    public MixEnvelop<CreditsDetailDO,CreditsDetailDO> refundIntegrate(JSONArray array) throws Exception {
        MixEnvelop<CreditsDetailDO, CreditsDetailDO> envelop = new MixEnvelop<>();
        for (int i=0;i<array.size();i++){
            JSONObject object = array.getJSONObject(i);
            CreditsDetailDO creditsDetailDO1 = credittsLogDetailDao.selectByTransactionId(object.getString("orderId"),"SHOPPING_PAY");
            CreditsDetailDO creditsDetailDO = new CreditsDetailDO();
            creditsDetailDO.setPatientId(creditsDetailDO1.getPatientId());
            creditsDetailDO.setAccountId(creditsDetailDO1.getAccountId());
            creditsDetailDO.setHospital(creditsDetailDO1.getHospital());
            creditsDetailDO.setTradeType("REFUND");
            creditsDetailDO.setTradeDirection(1);
            creditsDetailDO.setTransactionId(object.getString("orderId"));
            creditsDetailDO.setIntegrate(object.getDouble("integrate").intValue());
            creditsDetailDO.setCreateTime(new Date());
            creditsDetailDO.setUpdateTime(new Date());
            creditsDetailDO.setHospitalName(creditsDetailDO1.getHospitalName());
            creditsDetailDO.setSaasId("dev");
            creditsDetailDO.setId(getCode());
            creditsDetailDO.setCoupon(0);
            creditsDetailDO.setStatus(1);
            credittsLogDetailDao.save(creditsDetailDO);
            AccountDO accountDO = accountDao.selectByPatientId(creditsDetailDO1.getPatientId());
            accountDO.setTotal(accountDO.getTotal()+object.getDouble("integrate").intValue());
            accountDao.save(accountDO);
        }
        return envelop;
    }
}