|
|
@ -163,7 +163,7 @@ public class CustomerService {
|
|
|
|
* @return 是否成功
|
|
|
|
* @return 是否成功
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void turnBack(TurnBackDTO turnBackDTOS) {
|
|
|
|
public void turnBack(TurnBackDTO turnBackDTOS) throws Exception {
|
|
|
|
if (turnBackDTOS.getWxData().getUnionId() == null || turnBackDTOS.getUserId() == null) {
|
|
|
|
if (turnBackDTOS.getWxData().getUnionId() == null || turnBackDTOS.getUserId() == null) {
|
|
|
|
log.info("unionId 是空不操作");
|
|
|
|
log.info("unionId 是空不操作");
|
|
|
|
return;
|
|
|
|
return;
|
|
|
@ -222,11 +222,7 @@ public class CustomerService {
|
|
|
|
if (turnBackDTOS.getVipData() != null) {
|
|
|
|
if (turnBackDTOS.getVipData() != null) {
|
|
|
|
log.info("如果有vip数据就认为是vip客户然后绑定客户vip关系");
|
|
|
|
log.info("如果有vip数据就认为是vip客户然后绑定客户vip关系");
|
|
|
|
//有vip数据就不需要重新请求bsd的vip接口
|
|
|
|
//有vip数据就不需要重新请求bsd的vip接口
|
|
|
|
try {
|
|
|
|
vipCheck(turnBackDTOS);
|
|
|
|
vipCheck(turnBackDTOS);
|
|
|
|
|
|
|
|
} catch (ParseException e) {
|
|
|
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -235,7 +231,7 @@ public class CustomerService {
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param turnBackDTO vip数据
|
|
|
|
* @param turnBackDTO vip数据
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private void vipCheck(TurnBackDTO turnBackDTO) throws ParseException {
|
|
|
|
private void vipCheck(TurnBackDTO turnBackDTO) throws Exception {
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
OpCustomer opCustomer = new OpCustomer(turnBackDTO.getName(), turnBackDTO.getPhone());
|
|
|
|
OpCustomer opCustomer = new OpCustomer(turnBackDTO.getName(), turnBackDTO.getPhone());
|
|
|
|
opCustomer.setUpdateBy(Constants.SYS_OPERATION);
|
|
|
|
opCustomer.setUpdateBy(Constants.SYS_OPERATION);
|
|
|
|